[src]'s transfer amount is now [amount_per_transfer_from_this] units.")
+ return
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/attackby(obj/item/W, mob/user, params)
+ //DEFUSING NADE LOGIC
+ if (W.tool_behaviour == TOOL_WIRECUTTER && fused)
+ user.show_message("You cut the fuse!", MSG_VISUAL)
+ playsound(user, W.hitsound, 50, 1, -1)
+ icon_state = "coconut_carved"
+ desc = "A coconut. This one's got a hole in it."
+ name = "coconut"
+ defused = TRUE
+ fused = FALSE
+ fusedactive = FALSE
+ if(!seed.get_gene(/datum/plant_gene/trait/glow))
+ set_light(0, 0.0)
+ return
+ //IGNITING NADE LOGIC
+ if(!fusedactive && fused)
+ var/lighting_text = W.ignition_effect(src, user)
+ if(lighting_text)
+ user.visible_message("[user] ignites [src]'s fuse!", "You ignite the [src]'s fuse!")
+ fusedactive = TRUE
+ defused = FALSE
+ playsound(src, 'sound/effects/fuse.ogg', 100, 0)
+ message_admins("[ADMIN_LOOKUPFLW(user)] ignited a coconut bomb for detonation at [ADMIN_VERBOSEJMP(user)] [pretty_string_from_reagent_list(reagents.reagent_list)]")
+ log_game("[key_name(user)] primed a coconut grenade for detonation at [AREACOORD(user)].")
+ addtimer(CALLBACK(src, .proc/prime), 5 SECONDS)
+ icon_state = "coconut_grenade_active"
+ desc = "RUN!"
+ if(!seed.get_gene(/datum/plant_gene/trait/glow))
+ light_color = "#FFCC66" //for the fuse
+ set_light(3, 0.8)
+ return
+
+ //ADDING A FUSE, NADE LOGIC
+ if (istype(W,/obj/item/stack/sheet/cloth) || istype(W,/obj/item/stack/sheet/durathread))
+ if (carved && !straw && !fused)
+ user.show_message("You add a fuse to the coconut!", 1)
+ W.use(1)
+ fused = TRUE
+ icon_state = "coconut_grenade"
+ desc = "A makeshift bomb made out of a coconut. You estimate the fuse is long enough for 5 seconds."
+ name = "coconut bomb"
+ return
+ //ADDING STRAW LOGIC
+ if (istype(W,/obj/item/stack/sheet/mineral/bamboo) && opened && !straw && fused)
+ user.show_message("You add a bamboo straw to the coconut!", 1)
+ straw = TRUE
+ W.use(1)
+ icon_state += "_straw"
+ desc = "You can already feel like you're on a tropical vacation."
+ return
+ //OPENING THE NUT LOGIC
+ if (!carved && !chopped)
+ var/screwdrivered = W.tool_behaviour == TOOL_SCREWDRIVER
+ if(screwdrivered || W.sharpness)
+ user.show_message("You [screwdrivered ? "make a hole in the coconut" : "slice the coconut open"]!", 1)
+ carved = TRUE
+ opened = TRUE
+ spillable = !screwdrivered
+ reagent_flags = OPENCONTAINER
+ ENABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER)
+ icon_state = screwdrivered ? "coconut_carved" : "coconut_chopped"
+ desc = "A coconut. [screwdrivered ? "This one's got a hole in it" : "This one's sliced open, with all its delicious contents for your eyes to savour"]."
+ playsound(user, W.hitsound, 50, 1, -1)
+ return
+ return ..()
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/attack(mob/living/M, mob/user, obj/target)
+ if(M && user.a_intent == INTENT_HARM && !spillable)
+ var/obj/item/bodypart/affecting = user.zone_selected //Find what the player is aiming at
+ if (affecting == BODY_ZONE_HEAD && prob(15))
+ //smash the nut open
+ var/armor_block = min(90, M.run_armor_check(affecting, "melee", null, null,armour_penetration)) // For normal attack damage
+ M.apply_damage(force, BRUTE, affecting, armor_block)
+
+ //Sound
+ playsound(user, hitsound, 100, 1, -1)
+
+ //Attack logs
+ log_combat(user, M, "attacked", src)
+
+ //Display an attack message.
+ if(M != user)
+ M.visible_message("[user] has cracked open a [name] on [M]'s head!", \
+ "[user] has cracked open a [name] on [M]'s head!")
+ else
+ user.visible_message("[M] cracks open a [name] on their [M.p_them()] head!", \
+ "[M] cracks open a [name] on [M.p_their()] head!")
+
+ //The coconut breaks open so splash its reagents
+ spillable = TRUE
+ SplashReagents(M)
+
+ //Lastly we remove the nut
+ qdel(src)
+ else
+ . = ..()
+ return
+
+ if(fusedactive)
+ return
+
+ if(!opened)
+ return
+
+ if(!canconsume(M, user))
+ return
+
+ if(!reagents || !reagents.total_volume)
+ to_chat(user, "[src] is empty!")
+ return
+
+ if(user.a_intent == INTENT_HARM && spillable)
+ var/R
+ M.visible_message("[user] splashes the contents of [src] onto [M]!", \
+ "[user] splashes the contents of [src] onto [M]!")
+ if(reagents)
+ for(var/datum/reagent/A in reagents.reagent_list)
+ R += A.id + " ("
+ R += num2text(A.volume) + "),"
+ if(isturf(target) && reagents.reagent_list.len && thrownby)
+ log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
+ message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")
+ reagents.reaction(M, TOUCH)
+ log_combat(user, M, "splashed", R)
+ reagents.clear_reagents()
+ else
+ if(M != user)
+ M.visible_message("[user] attempts to feed something to [M].", \
+ "[user] attempts to feed something to you.")
+ if(!do_mob(user, M))
+ return
+ if(!reagents || !reagents.total_volume)
+ return // The drink might be empty after the delay, such as by spam-feeding
+ M.visible_message("[user] feeds something to [M].", "[user] feeds something to you.")
+ log_combat(user, M, "fed", reagents.log_list())
+ else
+ to_chat(user, "You swallow a gulp of [src].")
+ var/fraction = min(5/reagents.total_volume, 1)
+ reagents.reaction(M, INGEST, fraction)
+ addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5), 5)
+ playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/afterattack(obj/target, mob/user, proximity)
+ . = ..()
+ if(fusedactive)
+ return
+
+ if((!proximity) || !check_allowed_items(target,target_self=1))
+ return
+
+ if(target.is_refillable()) //Something like a glass. Player probably wants to transfer TO it.
+ if(!reagents.total_volume)
+ to_chat(user, "[src] is empty!")
+ return
+
+ if(target.reagents.holder_full())
+ to_chat(user, "[target] is full.")
+ return
+
+ var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
+ to_chat(user, "You transfer [trans] unit\s of the solution to [target].")
+
+ else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
+ if(!target.reagents.total_volume)
+ to_chat(user, "[target] is empty and can't be refilled!")
+ return
+
+ if(reagents.holder_full())
+ to_chat(user, "[src] is full.")
+ return
+
+ var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
+ to_chat(user, "You fill [src] with [trans] unit\s of the contents of [target].")
+
+ else if(reagents.total_volume)
+ if(user.a_intent == INTENT_HARM && spillable == TRUE)
+ user.visible_message("[user] splashes the contents of [src] onto [target]!", \
+ "You splash the contents of [src] onto [target].")
+ reagents.reaction(target, TOUCH)
+ reagents.clear_reagents()
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/dropped(mob/user)
+ . = ..()
+ transform *= TRANSFORM_USING_VARIABLE(40, 100) + 0.5 //temporary fix for size?
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/proc/prime()
+ if (defused)
+ return
+ var/turf/T = get_turf(src)
+ reagents.chem_temp = 1000
+ //Disable seperated contents when the grenade primes
+ if (seed.get_gene(/datum/plant_gene/trait/noreact))
+ DISABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT)
+ reagents.handle_reactions()
+ log_game("Coconut bomb detonation at [AREACOORD(T)], location [loc]")
+ qdel(src)
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/ex_act(severity)
+ qdel(src)
+
+/obj/item/reagent_containers/food/snacks/grown/coconut/deconstruct(disassembled = TRUE)
+ if(!disassembled && fused)
+ prime()
+ if(!QDELETED(src))
+ qdel(src)
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 4132719389..39e97e3801 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -27,6 +27,7 @@
var/rarity = 0 // How rare the plant is. Used for giving points to cargo when shipping off to CentCom.
var/list/mutatelist = list() // The type of plants that this plant can mutate into.
var/list/genes = list() // Plant genes are stored here, see plant_genes.dm for more info.
+ var/list/forbiddengenes = list()
var/list/reagents_add = list()
// A list of reagents to add to product.
// Format: "reagent_id" = potency multiplier
@@ -96,6 +97,10 @@
S.reagents_add = reagents_add.Copy() // Faster than grabbing the list from genes.
return S
+obj/item/seeds/proc/is_gene_forbidden(typepath)
+ return (typepath in forbiddengenes)
+
+
/obj/item/seeds/proc/get_gene(typepath)
return (locate(typepath) in genes)
@@ -448,7 +453,7 @@
for(var/i in 1 to amount_random_traits)
var/random_trait = pick((subtypesof(/datum/plant_gene/trait)-typesof(/datum/plant_gene/trait/plant_type)))
var/datum/plant_gene/trait/T = new random_trait
- if(T.can_add(src))
+ if(T.can_add(src) && !is_gene_forbidden(random_trait))
genes += T
else
qdel(T)
diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm
index 922b335a39..f8a7e70473 100644
--- a/code/modules/jobs/job_types/clown.dm
+++ b/code/modules/jobs/job_types/clown.dm
@@ -14,6 +14,8 @@
access = list(ACCESS_THEATRE)
minimal_access = list(ACCESS_THEATRE)
+ mind_traits = list(TRAIT_CLOWN_MENTALITY)
+
display_order = JOB_DISPLAY_ORDER_CLOWN
/datum/outfit/job/clown
diff --git a/code/modules/keybindings/bindings_human.dm b/code/modules/keybindings/bindings_human.dm
index a9eafacef6..ed033935b2 100644
--- a/code/modules/keybindings/bindings_human.dm
+++ b/code/modules/keybindings/bindings_human.dm
@@ -58,13 +58,23 @@
return
switch(_key)
if("Shift")
- sprint_hotkey(TRUE)
+ if(!user.prefs.sprint_spacebar)
+ user.prefs.sprint_toggle ? togglesprint() : sprint_hotkey(TRUE) //Yes, this looks hacky. Yes, this works.
+ return
+ if("Space")
+ if(user.prefs.sprint_spacebar)
+ user.prefs.sprint_toggle ? togglesprint() : sprint_hotkey(TRUE)
return
return ..()
/mob/living/carbon/human/key_up(_key, client/user)
switch(_key)
if("Shift")
- sprint_hotkey(FALSE)
+ if(!user.prefs.sprint_spacebar && !user.prefs.sprint_toggle)
+ sprint_hotkey(FALSE)
+ return
+ if("Space")
+ if(user.prefs.sprint_spacebar && !user.prefs.sprint_toggle)
+ sprint_hotkey(FALSE)
return
return ..()
diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm
index 295fc816e2..0d7ae7107b 100644
--- a/code/modules/library/soapstone.dm
+++ b/code/modules/library/soapstone.dm
@@ -117,6 +117,7 @@
anchored = TRUE
max_integrity = 30
layer = LATTICE_LAYER
+ light_power = 0.3
var/hidden_message
var/creator_key
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index 1f55f18823..3e361179de 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -70,7 +70,7 @@
//initialize things that are normally initialized after map load
parsed.initTemplateBounds()
smooth_zlevel(world.maxz)
- log_game("Z-level [name] loaded at at [x],[y],[world.maxz]")
+ log_game("Z-level [name] loaded at [x],[y],[world.maxz]")
return level
@@ -84,6 +84,13 @@
if(T.y+height > world.maxy)
return
+ var/list/border = block(locate(max(T.x-1, 1), max(T.y-1, 1), T.z),
+ locate(min(T.x+width+1, world.maxx), min(T.y+height+1, world.maxy), T.z))
+ for(var/L in border)
+ var/turf/turf_to_disable = L
+ SSair.remove_from_active(turf_to_disable) //stop processing turfs along the border to prevent runtimes, we return it in initTemplateBounds()
+ turf_to_disable.atmos_adjacent_turfs?.Cut()
+
// Accept cached maps, but don't save them automatically - we don't want
// ruins clogging up memory for the whole round.
var/datum/parsed_map/parsed = cached_map || new(file(mappath))
@@ -100,7 +107,7 @@
//initialize things that are normally initialized after map load
parsed.initTemplateBounds()
- log_game("[name] loaded at at [T.x],[T.y],[T.z]")
+ log_game("[name] loaded at [T.x],[T.y],[T.z]")
return bounds
/datum/map_template/proc/get_affected_turfs(turf/T, centered = FALSE)
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index e2459d780a..a7f84fd71f 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -18,7 +18,7 @@
/obj/effect/baseturf_helper/LateInitialize()
if(!baseturf_to_replace)
- baseturf_to_replace = typecacheof(/turf/open/space)
+ baseturf_to_replace = typecacheof(list(/turf/open/space,/turf/baseturf_bottom))
else if(!length(baseturf_to_replace))
baseturf_to_replace = list(baseturf_to_replace = TRUE)
else if(baseturf_to_replace[baseturf_to_replace[1]] != TRUE) // It's not associative
@@ -45,7 +45,6 @@
thing.PlaceOnBottom(null, baseturf)
else if(baseturf_to_replace[thing.baseturfs])
thing.assemble_baseturfs(baseturf)
- return
else
thing.PlaceOnBottom(null, baseturf)
@@ -107,16 +106,16 @@
/obj/effect/mapping_helpers/airlock/cyclelink_helper/Initialize(mapload)
. = ..()
if(!mapload)
- log_world("### MAP WARNING, [src] spawned outside of mapload!")
+ log_mapping("[src] spawned outside of mapload!")
return
var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc
if(airlock)
if(airlock.cyclelinkeddir)
- log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to set [airlock] cyclelinkeddir, but it's already set!")
+ log_mapping("[src] at [AREACOORD(src)] tried to set [airlock] cyclelinkeddir, but it's already set!")
else
airlock.cyclelinkeddir = dir
else
- log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]")
+ log_mapping("[src] failed to find an airlock at [AREACOORD(src)]")
/obj/effect/mapping_helpers/airlock/locked
@@ -126,16 +125,16 @@
/obj/effect/mapping_helpers/airlock/locked/Initialize(mapload)
. = ..()
if(!mapload)
- log_world("### MAP WARNING, [src] spawned outside of mapload!")
+ log_mapping("[src] spawned outside of mapload!")
return
var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc
if(airlock)
if(airlock.locked)
- log_world("### MAP WARNING, [src] at [AREACOORD(src)] tried to bolt [airlock] but it's already locked!")
+ log_mapping("[src] at [AREACOORD(src)] tried to bolt [airlock] but it's already locked!")
else
airlock.locked = TRUE
else
- log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]")
+ log_mapping("[src] failed to find an airlock at [AREACOORD(src)]")
/obj/effect/mapping_helpers/airlock/unres
name = "airlock unresctricted side helper"
@@ -144,13 +143,13 @@
/obj/effect/mapping_helpers/airlock/unres/Initialize(mapload)
. = ..()
if(!mapload)
- log_world("### MAP WARNING, [src] spawned outside of mapload!")
+ log_mapping("[src] spawned outside of mapload!")
return
var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in loc
if(airlock)
airlock.unres_sides ^= dir
else
- log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]")
+ log_mapping("[src] failed to find an airlock at [AREACOORD(src)]")
//needs to do its thing before spawn_rivers() is called
@@ -164,17 +163,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
var/turf/T = get_turf(src)
T.flags_1 |= NO_LAVA_GEN_1
-/// Adds the map it is on to the z_is_planet list
-/obj/effect/mapping_helpers/planet_z
- name = "planet z helper"
- layer = POINT_LAYER
-
-/obj/effect/mapping_helpers/planet_z/Initialize()
- . = ..()
- var/datum/space_level/S = SSmapping.get_level(z)
- S.traits[ZTRAIT_PLANET] = TRUE
-
-
//This helper applies components to things on the map directly.
/obj/effect/mapping_helpers/component_injector
name = "Component Injector"
diff --git a/code/modules/mapping/preloader.dm b/code/modules/mapping/preloader.dm
index e6fa2421a0..4b61663f66 100644
--- a/code/modules/mapping/preloader.dm
+++ b/code/modules/mapping/preloader.dm
@@ -8,18 +8,26 @@ GLOBAL_DATUM_INIT(_preloader, /datum/map_preloader, new)
var/list/attributes
var/target_path
-/datum/map_preloader/proc/setup(list/the_attributes, path)
+/world/proc/preloader_setup(list/the_attributes, path)
if(the_attributes.len)
GLOB.use_preloader = TRUE
- attributes = the_attributes
- target_path = path
+ var/datum/map_preloader/preloader_local = GLOB._preloader
+ preloader_local.attributes = the_attributes
+ preloader_local.target_path = path
-/datum/map_preloader/proc/load(atom/what)
+/world/proc/preloader_load(atom/what)
GLOB.use_preloader = FALSE
- for(var/attribute in attributes)
- var/value = attributes[attribute]
+ var/datum/map_preloader/preloader_local = GLOB._preloader
+ for(var/attribute in preloader_local.attributes)
+ var/value = preloader_local.attributes[attribute]
if(islist(value))
value = deepCopyList(value)
+ #ifdef TESTING
+ if(what.vars[attribute] == value)
+ var/message = "[what.type] at [AREACOORD(what)] - VAR: [attribute] = [isnull(value) ? "null" : (isnum(value) ? value : "\"[value]\"")]"
+ log_mapping("DIRTY VAR: [message]")
+ GLOB.dirty_vars += message
+ #endif
what.vars[attribute] = value
/area/template_noop
diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm
index 22be4aa246..9b27691dd3 100644
--- a/code/modules/mapping/reader.dm
+++ b/code/modules/mapping/reader.dm
@@ -306,8 +306,8 @@
//first instance the /area and remove it from the members list
index = members.len
if(members[index] != /area/template_noop)
- GLOB._preloader.setup(members_attributes[index])//preloader for assigning set variables on atom creation
var/atype = members[index]
+ world.preloader_setup(members_attributes[index], atype)//preloader for assigning set variables on atom creation
var/atom/instance = areaCache[atype]
if (!instance)
instance = GLOB.areas_by_type[atype]
@@ -318,7 +318,7 @@
instance.contents.Add(crds)
if(GLOB.use_preloader && instance)
- GLOB._preloader.load(instance)
+ world.preloader_load(instance)
//then instance the /turf and, if multiple tiles are presents, simulates the DMM underlays piling effect
@@ -354,7 +354,7 @@
//Instance an atom at (x,y,z) and gives it the variables in attributes
/datum/parsed_map/proc/instance_atom(path,list/attributes, turf/crds, no_changeturf, placeOnTop)
- GLOB._preloader.setup(attributes, path)
+ world.preloader_setup(attributes, path)
if(crds)
if(ispath(path, /turf))
@@ -368,7 +368,7 @@
. = create_atom(path, crds)//first preloader pass
if(GLOB.use_preloader && .)//second preloader pass, for those atoms that don't ..() in New()
- GLOB._preloader.load(.)
+ world.preloader_load(.)
//custom CHECK_TICK here because we don't want things created while we're sleeping to not initialize
if(TICK_CHECK)
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index ab3b20ac9f..7bef9b652a 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -926,7 +926,7 @@
timer = world.time + create_delay + 1
if(do_after(user, create_delay, target = T))
var/old_name = T.name
- if(T.TerraformTurf(turf_type))
+ if(T.TerraformTurf(turf_type, flags = CHANGETURF_INHERIT_AIR))
user.visible_message("[user] turns \the [old_name] into [transform_string]!")
message_admins("[ADMIN_LOOKUPFLW(user)] fired the lava staff at [ADMIN_VERBOSEJMP(T)]")
log_game("[key_name(user)] fired the lava staff at [AREACOORD(T)].")
@@ -937,7 +937,7 @@
qdel(L)
else
var/old_name = T.name
- if(T.TerraformTurf(reset_turf_type))
+ if(T.TerraformTurf(reset_turf_type, flags = CHANGETURF_INHERIT_AIR))
user.visible_message("[user] turns \the [old_name] into [reset_string]!")
timer = world.time + reset_cooldown
playsound(T,'sound/magic/fireball.ogg', 200, 1)
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 79da476719..b5f7bbf8ab 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -50,7 +50,7 @@
/obj/machinery/mineral/ore_redemption/examine(mob/user)
. = ..()
if(in_range(user, src) || isobserver(user))
- . += "The status display reads: Smelting [sheet_per_ore] sheet(s) per piece of ore.
Ore pickup speed at [ore_pickup_rate]."
+ . += "The status display reads: Smelting [sheet_per_ore] sheet(s) per piece of ore.
Reward point generation at [point_upgrade*100]%.
Ore pickup speed at [ore_pickup_rate]."
/obj/machinery/mineral/ore_redemption/proc/smelt_ore(obj/item/stack/ore/O)
var/datum/component/material_container/mat_container = materials.mat_container
@@ -63,7 +63,7 @@
ore_buffer -= O
if(O && O.refined_type)
- points += O.points * O.amount
+ points += O.points * point_upgrade * O.amount
var/material_amount = mat_container.get_item_material_amount(O)
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index 7aae26526e..5b664dc01a 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -27,12 +27,7 @@
/datum/preferences/proc/update_preview_icon(equip_job = TRUE)
// Determine what job is marked as 'High' priority, and dress them up as such.
- var/datum/job/previewJob
- var/highest_pref = 0
- for(var/job in job_preferences)
- if(job_preferences["[job]"] > highest_pref)
- previewJob = SSjob.GetJob(job)
- highest_pref = job_preferences["[job]"]
+ var/datum/job/previewJob = get_highest_job()
if(previewJob)
// Silicons only need a very basic preview since there is no customization for them.
@@ -57,3 +52,11 @@
parent.show_character_previews(new /mutable_appearance(mannequin))
unset_busy_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
+/datum/preferences/proc/get_highest_job()
+ var/highest_pref = 0
+ var/datum/job/highest_job
+ for(var/job in job_preferences)
+ if(job_preferences["[job]"] > highest_pref)
+ highest_job = SSjob.GetJob(job)
+ highest_pref = job_preferences["[job]"]
+ return highest_job
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
index dd66f68e5d..241ec8118e 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
@@ -74,4 +74,5 @@
/datum/sprite_accessory/underwear
icon = 'icons/mob/underwear.dmi'
- var/has_color = FALSE
\ No newline at end of file
+ var/has_color = FALSE
+ var/has_digitigrade = FALSE
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/socks.dm b/code/modules/mob/dead/new_player/sprite_accessories/socks.dm
index 0a35f0cd26..19ec677a72 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/socks.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/socks.dm
@@ -2,6 +2,9 @@
// Socks Definitions //
///////////////////////
+/datum/sprite_accessory/underwear/socks
+ has_digitigrade = TRUE
+
/datum/sprite_accessory/underwear/socks/nude
name = "Nude"
icon_state = null
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/underwear.dm b/code/modules/mob/dead/new_player/sprite_accessories/underwear.dm
index 3356804cb3..9441b5120a 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/underwear.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/underwear.dm
@@ -28,41 +28,49 @@
name = "Boxers"
icon_state = "boxers"
has_color = TRUE
+ has_digitigrade = TRUE
gender = MALE
/datum/sprite_accessory/underwear/bottom/male_bee
name = "Boxers - Bee"
icon_state = "bee_shorts"
+ has_digitigrade = TRUE
gender = MALE
/datum/sprite_accessory/underwear/bottom/male_hearts
name = "Boxers - Heart"
icon_state = "boxers_heart"
+ has_digitigrade = TRUE
gender = MALE
/datum/sprite_accessory/underwear/bottom/male_stripe
name = "Boxers - Striped"
icon_state = "boxers_striped"
+ has_digitigrade = TRUE
gender = MALE
/datum/sprite_accessory/underwear/bottom/male_commie
name = "Boxers - Striped Communist"
icon_state = "boxers_commie"
+ has_digitigrade = TRUE
gender = MALE
/datum/sprite_accessory/underwear/bottom/male_usastripe
name = "Boxers - Striped Freedom"
icon_state = "boxers_assblastusa"
+ has_digitigrade = TRUE
gender = MALE
/datum/sprite_accessory/underwear/bottom/male_uk
name = "Boxers - Striped UK"
icon_state = "boxers_uk"
+ has_digitigrade = TRUE
gender = MALE
/datum/sprite_accessory/underwear/bottom/boxer_briefs
name = "Boxer Briefs"
icon_state = "boxer_briefs"
+ has_digitigrade = TRUE
has_color = TRUE
/datum/sprite_accessory/underwear/bottom/panties
@@ -140,6 +148,7 @@
/datum/sprite_accessory/underwear/bottom/longjon
name = "Long John Bottoms"
icon_state = "ljonb"
+ has_digitigrade = TRUE
has_color = TRUE
/datum/sprite_accessory/underwear/bottom/swimsuit_red
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 2b9b01dc18..f1c4316c65 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -3,8 +3,6 @@ GLOBAL_LIST_EMPTY(ghost_images_simple) //this is a list of all ghost images as t
GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
-#define CANT_REENTER_ROUND -1
-
/mob/dead/observer
name = "ghost"
desc = "It's a g-g-g-g-ghooooost!" //jinkies!
@@ -21,7 +19,6 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
hud_type = /datum/hud/ghost
movement_type = GROUND | FLYING
var/can_reenter_corpse
- var/reenter_round_timeout = 0 // used to prevent people from coming back through ghost roles/midround antags as they suicide/cryo for a duration set by CONFIG_GET(number/suicide_reenter_round_timer) and CONFIG_GET(number/roundstart_suicide_time_limit)
var/datum/hud/living/carbon/hud = null // hud
var/bootime = 0
var/started_as_observer //This variable is set to 1 when you enter the game as an observer.
@@ -137,7 +134,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
AA.onNewMob(src)
. = ..()
-
+ AddElement(/datum/element/ghost_role_eligibility)
grant_all_languages()
/mob/dead/observer/get_photo_description(obj/item/camera/camera)
@@ -272,16 +269,12 @@ Works together with spawning an observer, noted above.
var/mob/dead/observer/ghost = new(src) // Transfer safety to observer spawning proc.
SStgui.on_transfer(src, ghost) // Transfer NanoUIs.
ghost.can_reenter_corpse = can_reenter_corpse
- if(penalize) //penalizing them from making a ghost role / midround antag comeback right away.
- var/penalty = CONFIG_GET(number/suicide_reenter_round_timer) MINUTES
- var/roundstart_quit_limit = CONFIG_GET(number/roundstart_suicide_time_limit) MINUTES
- if(world.time < roundstart_quit_limit) //add up the time difference to their antag rolling penalty if they quit before half a (ingame) hour even passed.
- penalty += roundstart_quit_limit - world.time
- if(penalty)
- ghost.reenter_round_timeout = world.realtime + penalty
- if(ghost.reenter_round_timeout - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
- ghost.reenter_round_timeout = CANT_REENTER_ROUND
+ if (client && client.prefs && client.prefs.auto_ooc)
+ if (!(client.prefs.chat_toggles & CHAT_OOC))
+ client.prefs.chat_toggles ^= CHAT_OOC
transfer_ckey(ghost, FALSE)
+ ghost.AddElement(/datum/element/ghost_role_eligibility,penalize) // technically already run earlier, but this adds the penalty
+ // needs to be done AFTER the ckey transfer, too
return ghost
/*
@@ -338,12 +331,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return
ghostize(0, penalize = TRUE)
-/mob/dead/observer/proc/can_reenter_round(silent = FALSE)
- if(reenter_round_timeout != CANT_REENTER_ROUND && reenter_round_timeout <= world.realtime)
- return TRUE
- if(!silent)
- to_chat(src, "You are unable to reenter the round[reenter_round_timeout != CANT_REENTER_ROUND ? " yet. Your ghost role blacklist will expire in [DisplayTimeText(reenter_round_timeout - world.realtime)]" : ""].")
- return FALSE
+
/mob/dead/observer/Move(NewLoc, direct)
if(updatedir)
@@ -898,5 +886,3 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
spawners_menu = new(src)
spawners_menu.ui_interact(src)
-
-#undef CANT_REENTER_ROUND
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index b9e27c0637..bdc691ce49 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -6,21 +6,21 @@
return 2 //no ears
/mob/living/carbon/alien/hitby(atom/movable/AM, skipcatch, hitpush)
- ..(AM, skipcatch = TRUE, hitpush = FALSE)
+ return ..(AM, skipcatch = TRUE, hitpush = FALSE)
+/mob/living/carbon/alien/can_embed(obj/item/I)
+ return FALSE
/*Code for aliens attacking aliens. Because aliens act on a hivemind, I don't see them as very aggressive with each other.
As such, they can either help or harm other aliens. Help works like the human help command while harm is a simple nibble.
In all, this is a lot like the monkey code. /N
*/
/mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M)
- if(isturf(loc) && istype(loc.loc, /area/start))
- to_chat(M, "No attacking people at spawn, you jackass.")
+ . = ..()
+ if(!.) // the attack was blocked or was help/grab intent
return
-
switch(M.a_intent)
-
- if ("help")
+ if (INTENT_HELP)
if(!recoveringstam)
resting = 0
AdjustStun(-60)
@@ -28,11 +28,7 @@ In all, this is a lot like the monkey code. /N
AdjustUnconscious(-60)
AdjustSleeping(-100)
visible_message("[M.name] nuzzles [src] trying to wake [p_them()] up!")
-
- if ("grab")
- grabbedby(M)
-
- else
+ if(INTENT_DISARM, INTENT_HARM)
if(health > 0)
M.do_attack_animation(src, ATTACK_EFFECT_BITE)
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
@@ -50,28 +46,31 @@ In all, this is a lot like the monkey code. /N
/mob/living/carbon/alien/attack_hand(mob/living/carbon/human/M)
- if(..()) //to allow surgery to return properly.
- return 0
-
+ . = ..()
+ if(.) //To allow surgery to return properly.
+ return
switch(M.a_intent)
- if("help")
+ if(INTENT_HELP)
help_shake_act(M)
- if("grab")
+ if(INTENT_GRAB)
grabbedby(M)
- if ("harm")
+ if (INTENT_HARM)
+ if(HAS_TRAIT(M, TRAIT_PACIFISM))
+ to_chat(M, "You don't want to hurt [src]!")
+ return TRUE
M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
- return 1
- if("disarm")
+ if(INTENT_DISARM)
+ if(HAS_TRAIT(M, TRAIT_PACIFISM))
+ to_chat(M, "You don't want to hurt [src]!")
+ return TRUE
M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
- return 1
- return 0
/mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M)
- if(..())
- if (stat != DEAD)
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
- apply_damage(rand(1, 3), BRUTE, affecting)
+ . = ..()
+ if(.) //successful monkey bite.
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+ apply_damage(rand(1, 3), BRUTE, affecting)
/mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M)
@@ -93,13 +92,15 @@ In all, this is a lot like the monkey code. /N
adjustStaminaLoss(damage)
/mob/living/carbon/alien/attack_slime(mob/living/simple_animal/slime/M)
- if(..()) //successful slime attack
- var/damage = rand(5, 35)
- if(M.is_adult)
- damage = rand(10, 40)
- adjustBruteLoss(damage)
- log_combat(M, src, "attacked")
- updatehealth()
+ . = ..()
+ if(!.) //unsuccessful slime attack
+ return
+ var/damage = rand(5, 35)
+ if(M.is_adult)
+ damage = rand(10, 40)
+ adjustBruteLoss(damage)
+ log_combat(M, src, "attacked")
+ updatehealth()
/mob/living/carbon/alien/ex_act(severity, target, origin)
if(origin && istype(origin, /datum/spacevine_mutation) && isvineimmune(src))
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
index fe682b5c99..d1ed09665b 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -63,12 +63,7 @@
if(A)
if(isliving(A))
var/mob/living/L = A
- var/blocked = FALSE
- if(ishuman(A))
- var/mob/living/carbon/human/H = A
- if(H.check_shields(src, 0, "the [name]", attack_type = LEAP_ATTACK))
- blocked = TRUE
- if(!blocked)
+ if(!L.check_shields(src, 0, "the [name]", attack_type = LEAP_ATTACK))
L.visible_message("[src] pounces on [L]!", "[src] pounces on you!")
L.Knockdown(100)
sleep(2)//Runtime prevention (infinite bump() calls on hulks)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
index b3839a6033..1d613db07a 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
@@ -5,9 +5,11 @@
else
..()
-/mob/living/carbon/alien/humanoid/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+/mob/living/carbon/alien/humanoid/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
if(user.a_intent == INTENT_HARM)
- ..(user, 1)
+ . = ..(user, TRUE)
+ if(.)
+ return
adjustBruteLoss(15)
var/hitverb = "punched"
if(mob_size < MOB_SIZE_LARGE)
@@ -21,46 +23,46 @@
return 1
/mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M)
- if(..())
- switch(M.a_intent)
- if ("harm")
- var/damage = rand(1, 9)
- if (prob(90))
- playsound(loc, "punch", 25, 1, -1)
- visible_message("[M] has punched [src]!", \
- "[M] has punched [src]!", null, COMBAT_MESSAGE_RANGE)
- if ((stat != DEAD) && (damage > 9 || prob(5)))//Regular humans have a very small chance of knocking an alien down.
- Unconscious(40)
- visible_message("[M] has knocked [src] down!", \
- "[M] has knocked [src] down!")
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
- apply_damage(damage, BRUTE, affecting)
- log_combat(M, src, "attacked")
+ . = ..()
+ if(.) //To allow surgery to return properly.
+ return
+ switch(M.a_intent)
+ if (INTENT_HARM)
+ var/damage = rand(1, 9)
+ if (prob(90))
+ playsound(loc, "punch", 25, 1, -1)
+ visible_message("[M] has punched [src]!", \
+ "[M] has punched [src]!", null, COMBAT_MESSAGE_RANGE)
+ if ((stat != DEAD) && (damage > 9 || prob(5)))//Regular humans have a very small chance of knocking an alien down.
+ Unconscious(40)
+ visible_message("[M] has knocked [src] down!", \
+ "[M] has knocked [src] down!")
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+ apply_damage(damage, BRUTE, affecting)
+ log_combat(M, src, "attacked")
+ else
+ playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+ visible_message("[M] has attempted to punch [src]!", \
+ "[M] has attempted to punch [src]!", null, COMBAT_MESSAGE_RANGE)
+
+ if (INTENT_DISARM)
+ if (!lying)
+ if (prob(5))
+ Unconscious(40)
+ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+ log_combat(M, src, "pushed")
+ visible_message("[M] has pushed down [src]!", \
+ "[M] has pushed down [src]!")
else
- playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- visible_message("[M] has attempted to punch [src]!", \
- "[M] has attempted to punch [src]!", null, COMBAT_MESSAGE_RANGE)
-
- if ("disarm")
- if (!lying)
- if (prob(5))
- Unconscious(40)
+ if (prob(50))
+ dropItemToGround(get_active_held_item())
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
- log_combat(M, src, "pushed")
- visible_message("[M] has pushed down [src]!", \
- "[M] has pushed down [src]!")
+ visible_message("[M] has disarmed [src]!", \
+ "[M] has disarmed [src]!", null, COMBAT_MESSAGE_RANGE)
else
- if (prob(50))
- dropItemToGround(get_active_held_item())
- playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
- visible_message("[M] has disarmed [src]!", \
- "[M] has disarmed [src]!", null, COMBAT_MESSAGE_RANGE)
- else
- playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- visible_message("[M] has attempted to disarm [src]!",\
- "[M] has attempted to disarm [src]!", null, COMBAT_MESSAGE_RANGE)
-
-
+ playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+ visible_message("[M] has attempted to disarm [src]!",\
+ "[M] has attempted to disarm [src]!", null, COMBAT_MESSAGE_RANGE)
/mob/living/carbon/alien/humanoid/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect)
if(!no_effect && !visual_effect_icon)
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index e1e079cbae..8e1e5aab8d 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -14,10 +14,9 @@
var/max_grown = 100
var/time_of_birth
- rotate_on_lying = 0
+ rotate_on_lying = FALSE
bodyparts = list(/obj/item/bodypart/chest/larva, /obj/item/bodypart/head/larva)
-
//This is fine right now, if we're adding organ specific damage this needs to be updated
/mob/living/carbon/alien/larva/Initialize()
diff --git a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
index 69c1be707d..7dabcf5abf 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva_defense.dm
@@ -1,26 +1,33 @@
/mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M)
- if(..())
- var/damage = rand(1, 9)
- if (prob(90))
- playsound(loc, "punch", 25, 1, -1)
- log_combat(M, src, "attacked")
- visible_message("[M] has kicked [src]!", \
- "[M] has kicked [src]!", null, COMBAT_MESSAGE_RANGE)
- if ((stat != DEAD) && (damage > 4.9))
- Unconscious(rand(100,200))
+ . = ..()
+ if(. || M.a_intent == INTENT_HELP || M.a_intent == INTENT_GRAB)
+ return
+ var/damage = rand(1, 9)
+ if (prob(90))
+ playsound(loc, "punch", 25, 1, -1)
+ log_combat(M, src, "attacked")
+ visible_message("[M] has kicked [src]!", \
+ "[M] has kicked [src]!", null, COMBAT_MESSAGE_RANGE)
+ if ((stat != DEAD) && (damage > 4.9))
+ Unconscious(rand(100,200))
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
- apply_damage(damage, BRUTE, affecting)
- else
- playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- visible_message("[M] has attempted to kick [src]!", \
- "[M] has attempted to kick [src]!", null, COMBAT_MESSAGE_RANGE)
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+ apply_damage(damage, BRUTE, affecting)
+ else
+ playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+ visible_message("[M] has attempted to kick [src]!", \
+ "[M] has attempted to kick [src]!", null, COMBAT_MESSAGE_RANGE)
-/mob/living/carbon/alien/larva/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+/mob/living/carbon/alien/larva/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
if(user.a_intent == INTENT_HARM)
- ..(user, 1)
+ . = ..(user, TRUE)
+ if(.)
+ return
+ playsound(loc, "punch", 25, 1, -1)
+ visible_message("[user] has pummeled [src]!", \
+ "[user] has pummeled [src]!", null, COMBAT_MESSAGE_RANGE)
adjustBruteLoss(5 + rand(1,9))
new /datum/forced_movement(src, get_step_away(user,src, 30), 1)
return 1
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index 0bfd23cbff..c08fe4f582 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -103,15 +103,17 @@
new_xeno.notransform = 0
new_xeno.invisibility = 0
+ var/mob/living/carbon/old_owner = owner
if(kill_on_sucess) //ITS TOO LATE
new_xeno.visible_message("[new_xeno] bursts out of [owner]!", "You exit [owner], your previous host.", "You hear organic matter ripping and tearing!")
owner.apply_damage(rand(100,300),BRUTE,zone,FALSE) //Random high damage to torso so health sensors don't metagame.
- owner.spill_organs(TRUE,FALSE,TRUE) //Lets still make the death gruesome and impossible to just simply defib someone.
+ var/obj/item/bodypart/B = owner.get_bodypart(zone)
+ B.drop_organs(owner) //Lets still make the death gruesome and impossible to just simply defib someone.
owner.death(FALSE) //Just in case some freak occurance occurs where you somehow survive all your organs being removed from you and the 100-300 brute damage.
else //When it is removed via surgery at a late stage, rather than forced.
new_xeno.visible_message("[new_xeno] wriggles out of [owner]!", "You exit [owner], your previous host.")
owner.adjustBruteLoss(40)
- owner.cut_overlay(overlay)
+ old_owner.cut_overlay(overlay)
qdel(src)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 52cf82a06a..102bc6fc3d 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -1,990 +1,991 @@
-/mob/living/carbon
- blood_volume = BLOOD_VOLUME_NORMAL
-
-/mob/living/carbon/Initialize()
- . = ..()
- create_reagents(1000)
- update_body_parts() //to update the carbon's new bodyparts appearance
- GLOB.carbon_list += src
- blood_volume = (BLOOD_VOLUME_NORMAL * blood_ratio)
-
-/mob/living/carbon/Destroy()
- //This must be done first, so the mob ghosts correctly before DNA etc is nulled
- . = ..()
-
- QDEL_LIST(internal_organs)
- QDEL_LIST(stomach_contents)
- QDEL_LIST(bodyparts)
- QDEL_LIST(implants)
- remove_from_all_data_huds()
- QDEL_NULL(dna)
- GLOB.carbon_list -= src
-
-/mob/living/carbon/initialize_footstep()
- AddComponent(/datum/component/footstep, 0.6, 2)
-
-/mob/living/carbon/relaymove(mob/user, direction)
- if(user in src.stomach_contents)
- if(prob(40))
- if(prob(25))
- audible_message("You hear something rumbling inside [src]'s stomach...", \
- "You hear something rumbling.", 4,\
- "Something is rumbling inside your stomach!")
- var/obj/item/I = user.get_active_held_item()
- if(I && I.force)
- var/d = rand(round(I.force / 4), I.force)
- var/obj/item/bodypart/BP = get_bodypart(BODY_ZONE_CHEST)
- if(BP.receive_damage(d, 0))
- update_damage_overlays()
- visible_message("[user] attacks [src]'s stomach wall with the [I.name]!", \
- "[user] attacks your stomach wall with the [I.name]!")
- playsound(user.loc, 'sound/effects/attackblob.ogg', 50, 1)
-
- if(prob(src.getBruteLoss() - 50))
- for(var/atom/movable/A in stomach_contents)
- A.forceMove(drop_location())
- stomach_contents.Remove(A)
- src.gib()
-
-
-/mob/living/carbon/swap_hand(held_index)
- if(!held_index)
- held_index = (active_hand_index % held_items.len)+1
-
- var/obj/item/item_in_hand = src.get_active_held_item()
- if(item_in_hand) //this segment checks if the item in your hand is twohanded.
- var/obj/item/twohanded/TH = item_in_hand
- if(istype(TH))
- if(TH.wielded == 1)
- to_chat(usr, "Your other hand is too busy holding [TH]")
- return
- var/oindex = active_hand_index
- active_hand_index = held_index
- if(hud_used)
- var/obj/screen/inventory/hand/H
- H = hud_used.hand_slots["[oindex]"]
- if(H)
- H.update_icon()
- H = hud_used.hand_slots["[held_index]"]
- if(H)
- H.update_icon()
-
-
-/mob/living/carbon/activate_hand(selhand) //l/r OR 1-held_items.len
- if(!selhand)
- selhand = (active_hand_index % held_items.len)+1
-
- if(istext(selhand))
- selhand = lowertext(selhand)
- if(selhand == "right" || selhand == "r")
- selhand = 2
- if(selhand == "left" || selhand == "l")
- selhand = 1
-
- if(selhand != active_hand_index)
- swap_hand(selhand)
- else
- mode() // Activate held item
-
-/mob/living/carbon/attackby(obj/item/I, mob/user, params)
- if(lying && surgeries.len)
- if(user != src && (user.a_intent == INTENT_HELP || user.a_intent == INTENT_DISARM))
- for(var/datum/surgery/S in surgeries)
- if(S.next_step(user,user.a_intent))
- return 1
- return ..()
-
-/mob/living/carbon/throw_impact(atom/hit_atom, throwingdatum)
- . = ..()
- var/hurt = TRUE
- if(istype(throwingdatum, /datum/thrownthing))
- var/datum/thrownthing/D = throwingdatum
- if(iscyborg(D.thrower))
- var/mob/living/silicon/robot/R = D.thrower
- if(!R.emagged)
- hurt = FALSE
- if(hit_atom.density && isturf(hit_atom))
- if(hurt)
- Knockdown(20)
- take_bodypart_damage(10)
- if(iscarbon(hit_atom) && hit_atom != src)
- var/mob/living/carbon/victim = hit_atom
- if(victim.movement_type & FLYING)
- return
- if(hurt)
- victim.take_bodypart_damage(10)
- take_bodypart_damage(10)
- victim.Knockdown(20)
- Knockdown(20)
- visible_message("[src] crashes into [victim], knocking them both over!",\
- "You violently crash into [victim]!")
- playsound(src,'sound/weapons/punch1.ogg',50,1)
-
-
-//Throwing stuff
-/mob/living/carbon/proc/toggle_throw_mode()
- if(stat)
- return
- if(in_throw_mode)
- throw_mode_off()
- else
- throw_mode_on()
-
-
-/mob/living/carbon/proc/throw_mode_off()
- in_throw_mode = 0
- if(client && hud_used)
- hud_used.throw_icon.icon_state = "act_throw_off"
-
-
-/mob/living/carbon/proc/throw_mode_on()
- in_throw_mode = 1
- if(client && hud_used)
- hud_used.throw_icon.icon_state = "act_throw_on"
-
-/mob/proc/throw_item(atom/target)
- SEND_SIGNAL(src, COMSIG_MOB_THROW, target)
- return
-
-/mob/living/carbon/throw_item(atom/target)
- throw_mode_off()
- if(!target || !isturf(loc))
- return
- if(istype(target, /obj/screen))
- return
-
- //CIT CHANGES - makes it impossible to throw while in stamina softcrit
- if(getStaminaLoss() >= STAMINA_SOFTCRIT)
- to_chat(src, "You're too exhausted.")
- return
- //END OF CIT CHANGES
-
- var/obj/item/I = src.get_active_held_item()
-
- var/atom/movable/thrown_thing
- var/mob/living/throwable_mob
-
- if(istype(I, /obj/item/clothing/head/mob_holder))
- var/obj/item/clothing/head/mob_holder/holder = I
- if(holder.held_mob)
- throwable_mob = holder.held_mob
- holder.release()
-
- if(!I || throwable_mob)
- if(!throwable_mob && pulling && isliving(pulling) && grab_state >= GRAB_AGGRESSIVE)
- throwable_mob = pulling
-
- if(throwable_mob && !throwable_mob.buckled)
- thrown_thing = throwable_mob
- if(pulling)
- stop_pulling()
- if(HAS_TRAIT(src, TRAIT_PACIFISM))
- to_chat(src, "You gently let go of [throwable_mob].")
- return
-
- adjustStaminaLossBuffered(25)//CIT CHANGE - throwing an entire person shall be very tiring
- var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
- var/turf/end_T = get_turf(target)
- if(start_T && end_T)
- log_combat(src, throwable_mob, "thrown", addition="grab from tile in [AREACOORD(start_T)] towards tile at [AREACOORD(end_T)]")
-
- else if(!CHECK_BITFIELD(I.item_flags, ABSTRACT) && !HAS_TRAIT(I, TRAIT_NODROP))
- thrown_thing = I
- dropItemToGround(I)
-
- if(HAS_TRAIT(src, TRAIT_PACIFISM) && I.throwforce)
- to_chat(src, "You set [I] down gently on the ground.")
- return
-
- adjustStaminaLossBuffered(I.getweight()*2)//CIT CHANGE - throwing items shall be more tiring than swinging em. Doubly so.
-
- if(thrown_thing)
- visible_message("[src] has thrown [thrown_thing].")
- src.log_message("has thrown [thrown_thing]", LOG_ATTACK)
- do_attack_animation(target, no_effect = 1)
- playsound(loc, 'sound/weapons/punchmiss.ogg', 50, 1, -1)
- newtonian_move(get_dir(target, src))
- thrown_thing.throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed, src)
-
-
-
-/mob/living/carbon/restrained(ignore_grab)
- . = (handcuffed || (!ignore_grab && pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE))
-
-/mob/living/carbon/proc/canBeHandcuffed()
- return 0
-
-
-/mob/living/carbon/show_inv(mob/user)
- user.set_machine(src)
- var/dat = {"
-
- [name]
-
-
Head: [(head && !(head.item_flags & ABSTRACT)) ? head : "Nothing"]
-
Mask: [(wear_mask && !(wear_mask.item_flags & ABSTRACT)) ? wear_mask : "Nothing"]
-
Neck: [(wear_neck && !(wear_neck.item_flags & ABSTRACT)) ? wear_neck : "Nothing"]"}
-
- for(var/i in 1 to held_items.len)
- var/obj/item/I = get_item_for_held_index(i)
- dat += "
[get_held_index_name(i)]:[(I && !(I.item_flags & ABSTRACT)) ? I : "Nothing"]"
-
- dat += "
Back: [back ? back : "Nothing"]"
-
- if(istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/tank))
- dat += "
[internal ? "Disable Internals" : "Set Internals"]"
-
- if(handcuffed)
- dat += "
Handcuffed"
- if(legcuffed)
- dat += "
Legcuffed"
-
- dat += {"
-
-
Close
- "}
- user << browse(dat, "window=mob[REF(src)];size=325x500")
- onclose(user, "mob[REF(src)]")
-
-/mob/living/carbon/Topic(href, href_list)
- ..()
- //strip panel
- if(usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
- if(href_list["internal"])
- var/slot = text2num(href_list["internal"])
- var/obj/item/ITEM = get_item_by_slot(slot)
- if(ITEM && istype(ITEM, /obj/item/tank) && wear_mask && (wear_mask.clothing_flags & ALLOWINTERNALS))
- visible_message("[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].", \
- "[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].")
- if(do_mob(usr, src, POCKET_STRIP_DELAY))
- if(internal)
- internal = null
- update_internals_hud_icon(0)
- else if(ITEM && istype(ITEM, /obj/item/tank))
- if((wear_mask && (wear_mask.clothing_flags & ALLOWINTERNALS)) || getorganslot(ORGAN_SLOT_BREATHING_TUBE))
- internal = ITEM
- update_internals_hud_icon(1)
-
- visible_message("[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name].", \
- "[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name].")
-
-
-/mob/living/carbon/fall(forced)
- loc.handle_fall(src, forced)//it's loc so it doesn't call the mob's handle_fall which does nothing
-
-/mob/living/carbon/is_muzzled()
- return(istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
-
-/mob/living/carbon/hallucinating()
- if(hallucination)
- return TRUE
- else
- return FALSE
-
-/mob/living/carbon/resist_buckle()
- if(restrained())
- changeNext_move(CLICK_CD_BREAKOUT)
- last_special = world.time + CLICK_CD_BREAKOUT
- var/buckle_cd = 600
- if(handcuffed)
- var/obj/item/restraints/O = src.get_item_by_slot(SLOT_HANDCUFFED)
- buckle_cd = O.breakouttime
- visible_message("[src] attempts to unbuckle [p_them()]self!", \
- "You attempt to unbuckle yourself... (This will take around [round(buckle_cd/600,1)] minute\s, and you need to stay still.)")
- if(do_after(src, buckle_cd, 0, target = src))
- if(!buckled)
- return
- buckled.user_unbuckle_mob(src,src)
- else
- if(src && buckled)
- to_chat(src, "You fail to unbuckle yourself!")
- else
- buckled.user_unbuckle_mob(src,src)
-
-/mob/living/carbon/resist_fire()
- fire_stacks -= 5
- Knockdown(60, TRUE, TRUE)
- spin(32,2)
- visible_message("[src] rolls on the floor, trying to put [p_them()]self out!", \
- "You stop, drop, and roll!")
- sleep(30)
- if(fire_stacks <= 0)
- visible_message("[src] has successfully extinguished [p_them()]self!", \
- "You extinguish yourself.")
- ExtinguishMob()
- return
-
-/mob/living/carbon/resist_restraints()
- var/obj/item/I = null
- var/type = 0
- if(handcuffed)
- I = handcuffed
- type = 1
- else if(legcuffed)
- I = legcuffed
- type = 2
- if(I)
- if(type == 1)
- changeNext_move(CLICK_CD_BREAKOUT)
- last_special = world.time + CLICK_CD_BREAKOUT
- if(type == 2)
- changeNext_move(CLICK_CD_RANGE)
- last_special = world.time + CLICK_CD_RANGE
- cuff_resist(I)
-
-
-/mob/living/carbon/proc/cuff_resist(obj/item/I, breakouttime = 600, cuff_break = 0)
- if(I.item_flags & BEING_REMOVED)
- to_chat(src, "You're already attempting to remove [I]!")
- return
- I.item_flags |= BEING_REMOVED
- breakouttime = I.breakouttime
- if(!cuff_break)
- visible_message("[src] attempts to remove [I]!")
- to_chat(src, "You attempt to remove [I]... (This will take around [DisplayTimeText(breakouttime)] and you need to stand still.)")
- if(do_after(src, breakouttime, 0, target = src))
- clear_cuffs(I, cuff_break)
- else
- to_chat(src, "You fail to remove [I]!")
-
- else if(cuff_break == FAST_CUFFBREAK)
- breakouttime = 50
- visible_message("[src] is trying to break [I]!")
- to_chat(src, "You attempt to break [I]... (This will take around 5 seconds and you need to stand still.)")
- if(do_after(src, breakouttime, 0, target = src))
- clear_cuffs(I, cuff_break)
- else
- to_chat(src, "You fail to break [I]!")
-
- else if(cuff_break == INSTANT_CUFFBREAK)
- clear_cuffs(I, cuff_break)
- I.item_flags &= ~BEING_REMOVED
-
-/mob/living/carbon/proc/uncuff()
- if (handcuffed)
- var/obj/item/W = handcuffed
- handcuffed = null
- if (buckled && buckled.buckle_requires_restraints)
- buckled.unbuckle_mob(src)
- update_handcuffed()
- if (client)
- client.screen -= W
- if (W)
- W.forceMove(drop_location())
- W.dropped(src)
- if (W)
- W.layer = initial(W.layer)
- W.plane = initial(W.plane)
- changeNext_move(0)
- if (legcuffed)
- var/obj/item/W = legcuffed
- legcuffed = null
- update_inv_legcuffed()
- if (client)
- client.screen -= W
- if (W)
- W.forceMove(drop_location())
- W.dropped(src)
- if (W)
- W.layer = initial(W.layer)
- W.plane = initial(W.plane)
- changeNext_move(0)
-
-/mob/living/carbon/proc/clear_cuffs(obj/item/I, cuff_break)
- if(!I.loc || buckled)
- return
- visible_message("[src] manages to [cuff_break ? "break" : "remove"] [I]!")
- to_chat(src, "You successfully [cuff_break ? "break" : "remove"] [I].")
-
- if(cuff_break)
- . = !((I == handcuffed) || (I == legcuffed))
- qdel(I)
- return
-
- else
- if(I == handcuffed)
- handcuffed.forceMove(drop_location())
- handcuffed.dropped(src)
- handcuffed = null
- if(buckled && buckled.buckle_requires_restraints)
- buckled.unbuckle_mob(src)
- update_handcuffed()
- return
- if(I == legcuffed)
- legcuffed.forceMove(drop_location())
- legcuffed.dropped()
- legcuffed = null
- update_inv_legcuffed()
- return
- else
- dropItemToGround(I)
- return
- return TRUE
-
-/mob/living/carbon/get_standard_pixel_y_offset(lying = 0)
- if(lying)
- return -6
- else
- return initial(pixel_y)
-
-/mob/living/carbon/proc/accident(obj/item/I)
- if(!I || (I.item_flags & ABSTRACT) || HAS_TRAIT(I, TRAIT_NODROP))
- return
-
- //dropItemToGround(I) CIT CHANGE - makes it so the item doesn't drop if the modifier rolls above 100
-
- var/modifier = 0
-
- if(HAS_TRAIT(src, TRAIT_CLUMSY))
- modifier -= 40 //Clumsy people are more likely to hit themselves -Honk!
-
- //CIT CHANGES START HERE
- else if(combatmode)
- modifier += 50
-
- if(modifier < 100)
- dropItemToGround(I)
- //END OF CIT CHANGES
-
- switch(rand(1,100)+modifier) //91-100=Nothing special happens
- if(-INFINITY to 0) //attack yourself
- I.attack(src,src)
- if(1 to 30) //throw it at yourself
- I.throw_impact(src)
- if(31 to 60) //Throw object in facing direction
- var/turf/target = get_turf(loc)
- var/range = rand(2,I.throw_range)
- for(var/i = 1; i < range; i++)
- var/turf/new_turf = get_step(target, dir)
- target = new_turf
- if(new_turf.density)
- break
- I.throw_at(target,I.throw_range,I.throw_speed,src)
- if(61 to 90) //throw it down to the floor
- var/turf/target = get_turf(loc)
- I.throw_at(target,I.throw_range,I.throw_speed,src)
-
-/mob/living/carbon/Stat()
- ..()
- if(statpanel("Status"))
- var/obj/item/organ/alien/plasmavessel/vessel = getorgan(/obj/item/organ/alien/plasmavessel)
- if(vessel)
- stat(null, "Plasma Stored: [vessel.storedPlasma]/[vessel.max_plasma]")
- if(locate(/obj/item/assembly/health) in src)
- stat(null, "Health: [health]")
-
- add_abilities_to_panel()
-
-/mob/living/carbon/attack_ui(slot)
- if(!has_hand_for_held_index(active_hand_index))
- return 0
- return ..()
-
-/mob/living/carbon/proc/vomit(lost_nutrition = 10, blood = FALSE, stun = TRUE, distance = 1, message = TRUE, toxic = FALSE)
- if(HAS_TRAIT(src, TRAIT_NOHUNGER))
- return 1
-
- if(nutrition < 100 && !blood)
- if(message)
- visible_message("[src] dry heaves!", \
- "You try to throw up, but there's nothing in your stomach!")
- if(stun)
- Knockdown(200)
- return 1
-
- if(is_mouth_covered()) //make this add a blood/vomit overlay later it'll be hilarious
- if(message)
- visible_message("[src] throws up all over [p_them()]self!", \
- "You throw up all over yourself!")
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "vomit", /datum/mood_event/vomitself)
- distance = 0
- else
- if(message)
- visible_message("[src] throws up!", "You throw up!")
- if(!isflyperson(src))
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "vomit", /datum/mood_event/vomit)
- if(stun)
- Stun(80)
-
- playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1)
- var/turf/T = get_turf(src)
- if(!blood)
- nutrition -= lost_nutrition
- adjustToxLoss(-3)
- for(var/i=0 to distance)
- if(blood)
- if(T)
- add_splatter_floor(T)
- if(stun)
- adjustBruteLoss(3)
- else if(src.reagents.has_reagent("blazaam"))
- if(T)
- T.add_vomit_floor(src, VOMIT_PURPLE)
- else
- if(T)
- T.add_vomit_floor(src, VOMIT_TOXIC)//toxic barf looks different
- T = get_step(T, dir)
- if (is_blocked_turf(T))
- break
- return 1
-
-/mob/living/carbon/proc/spew_organ(power = 5, amt = 1)
- for(var/i in 1 to amt)
- if(!internal_organs.len)
- break //Guess we're out of organs!
- var/obj/item/organ/guts = pick(internal_organs)
- var/turf/T = get_turf(src)
- guts.Remove(src)
- guts.forceMove(T)
- var/atom/throw_target = get_edge_target_turf(guts, dir)
- guts.throw_at(throw_target, power, 4, src)
-
-
-/mob/living/carbon/fully_replace_character_name(oldname,newname)
- ..()
- if(dna)
- dna.real_name = real_name
-
-//Updates the mob's health from bodyparts and mob damage variables
-/mob/living/carbon/updatehealth()
- if(status_flags & GODMODE)
- return
- var/total_burn = 0
- var/total_brute = 0
- var/total_stamina = 0
- for(var/X in bodyparts) //hardcoded to streamline things a bit
- var/obj/item/bodypart/BP = X
- total_brute += (BP.brute_dam * BP.body_damage_coeff)
- total_burn += (BP.burn_dam * BP.body_damage_coeff)
- total_stamina += (BP.stamina_dam * BP.stam_damage_coeff)
- health = round(maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute, DAMAGE_PRECISION)
- staminaloss = round(total_stamina, DAMAGE_PRECISION)
- update_stat()
- if(((maxHealth - total_burn) < HEALTH_THRESHOLD_DEAD) && stat == DEAD )
- become_husk("burn")
- med_hud_set_health()
- if(stat == SOFT_CRIT)
- add_movespeed_modifier(MOVESPEED_ID_CARBON_SOFTCRIT, TRUE, multiplicative_slowdown = SOFTCRIT_ADD_SLOWDOWN)
- else
- remove_movespeed_modifier(MOVESPEED_ID_CARBON_SOFTCRIT, TRUE)
-
-/mob/living/carbon/update_stamina()
- var/stam = getStaminaLoss()
- if(stam > DAMAGE_PRECISION)
- var/total_health = (health - stam)
- if(total_health <= crit_threshold && !stat)
- if(!IsKnockdown())
- to_chat(src, "You're too exhausted to keep going...")
- Knockdown(100)
- update_health_hud()
-
-/mob/living/carbon/update_sight()
- if(!client)
- return
- if(stat == DEAD)
- sight = (SEE_TURFS|SEE_MOBS|SEE_OBJS)
- see_in_dark = 8
- see_invisible = SEE_INVISIBLE_OBSERVER
- return
-
- sight = initial(sight)
- lighting_alpha = initial(lighting_alpha)
- var/obj/item/organ/eyes/E = getorganslot(ORGAN_SLOT_EYES)
- if(!E)
- update_tint()
- else
- see_invisible = E.see_invisible
- see_in_dark = E.see_in_dark
- sight |= E.sight_flags
- if(!isnull(E.lighting_alpha))
- lighting_alpha = E.lighting_alpha
- if(HAS_TRAIT(src, TRAIT_NIGHT_VISION))
- lighting_alpha = min(LIGHTING_PLANE_ALPHA_NV_TRAIT, lighting_alpha)
- see_in_dark = max(NIGHT_VISION_DARKSIGHT_RANGE, see_in_dark)
-
- if(client.eye && client.eye != src)
- var/atom/A = client.eye
- if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates.
- return
-
- if(glasses)
- var/obj/item/clothing/glasses/G = glasses
- sight |= G.vision_flags
- see_in_dark = max(G.darkness_view, see_in_dark)
- if(G.invis_override)
- see_invisible = G.invis_override
- else
- see_invisible = min(G.invis_view, see_invisible)
- if(!isnull(G.lighting_alpha))
- lighting_alpha = min(lighting_alpha, G.lighting_alpha)
- if(dna)
- for(var/X in dna.mutations)
- var/datum/mutation/M = X
- if(M.name == XRAY)
- sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
- see_in_dark = max(see_in_dark, 8)
-
- if(see_override)
- see_invisible = see_override
- . = ..()
-
-
-//to recalculate and update the mob's total tint from tinted equipment it's wearing.
-/mob/living/carbon/proc/update_tint()
- if(!GLOB.tinted_weldhelh)
- return
- tinttotal = get_total_tint()
- if(tinttotal >= TINT_BLIND)
- become_blind(EYES_COVERED)
- else if(tinttotal >= TINT_DARKENED)
- cure_blind(EYES_COVERED)
- overlay_fullscreen("tint", /obj/screen/fullscreen/impaired, 2)
- else
- cure_blind(EYES_COVERED)
- clear_fullscreen("tint", 0)
-
-/mob/living/carbon/proc/get_total_tint()
- . = 0
- if(istype(head, /obj/item/clothing/head))
- var/obj/item/clothing/head/HT = head
- . += HT.tint
- if(wear_mask)
- . += wear_mask.tint
-
- var/obj/item/organ/eyes/E = getorganslot(ORGAN_SLOT_EYES)
- if(E)
- . += E.tint
-
- else
- . += INFINITY
-
-/mob/living/carbon/get_permeability_protection(list/target_zones = list(HANDS,CHEST,GROIN,LEGS,FEET,ARMS,HEAD))
- var/list/tally = list()
- for(var/obj/item/I in get_equipped_items())
- for(var/zone in target_zones)
- if(I.body_parts_covered & zone)
- tally["[zone]"] = max(1 - I.permeability_coefficient, target_zones["[zone]"])
- var/protection = 0
- for(var/key in tally)
- protection += tally[key]
- protection *= INVERSE(target_zones.len)
- return protection
-
-//this handles hud updates
-/mob/living/carbon/update_damage_hud()
-
- if(!client)
- return
-
- if(health <= crit_threshold)
- var/severity = 0
- switch(health)
- if(-20 to -10)
- severity = 1
- if(-30 to -20)
- severity = 2
- if(-40 to -30)
- severity = 3
- if(-50 to -40)
- severity = 4
- if(-50 to -40)
- severity = 5
- if(-60 to -50)
- severity = 6
- if(-70 to -60)
- severity = 7
- if(-90 to -70)
- severity = 8
- if(-95 to -90)
- severity = 9
- if(-INFINITY to -95)
- severity = 10
- if(!InFullCritical())
- var/visionseverity = 4
- switch(health)
- if(-8 to -4)
- visionseverity = 5
- if(-12 to -8)
- visionseverity = 6
- if(-16 to -12)
- visionseverity = 7
- if(-20 to -16)
- visionseverity = 8
- if(-24 to -20)
- visionseverity = 9
- if(-INFINITY to -24)
- visionseverity = 10
- overlay_fullscreen("critvision", /obj/screen/fullscreen/crit/vision, visionseverity)
- else
- clear_fullscreen("critvision")
- overlay_fullscreen("crit", /obj/screen/fullscreen/crit, severity)
- else
- clear_fullscreen("crit")
- clear_fullscreen("critvision")
-
- //Oxygen damage overlay
- var/windedup = getOxyLoss() + getStaminaLoss() * 0.2
- if(windedup)
- var/severity = 0
- switch(windedup)
- if(10 to 20)
- severity = 1
- if(20 to 25)
- severity = 2
- if(25 to 30)
- severity = 3
- if(30 to 35)
- severity = 4
- if(35 to 40)
- severity = 5
- if(40 to 45)
- severity = 6
- if(45 to INFINITY)
- severity = 7
- overlay_fullscreen("oxy", /obj/screen/fullscreen/oxy, severity)
- else
- clear_fullscreen("oxy")
-
- //Fire and Brute damage overlay (BSSR)
- var/hurtdamage = getBruteLoss() + getFireLoss() + damageoverlaytemp
- if(hurtdamage)
- var/severity = 0
- switch(hurtdamage)
- if(5 to 15)
- severity = 1
- if(15 to 30)
- severity = 2
- if(30 to 45)
- severity = 3
- if(45 to 70)
- severity = 4
- if(70 to 85)
- severity = 5
- if(85 to INFINITY)
- severity = 6
- overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity)
- else
- clear_fullscreen("brute")
-
-/mob/living/carbon/update_health_hud(shown_health_amount)
- if(!client || !hud_used)
- return
- if(hud_used.healths)
- if(stat != DEAD)
- . = 1
- if(!shown_health_amount)
- shown_health_amount = health
- if(shown_health_amount >= maxHealth)
- hud_used.healths.icon_state = "health0"
- else if(shown_health_amount > maxHealth*0.8)
- hud_used.healths.icon_state = "health1"
- else if(shown_health_amount > maxHealth*0.6)
- hud_used.healths.icon_state = "health2"
- else if(shown_health_amount > maxHealth*0.4)
- hud_used.healths.icon_state = "health3"
- else if(shown_health_amount > maxHealth*0.2)
- hud_used.healths.icon_state = "health4"
- else if(shown_health_amount > 0)
- hud_used.healths.icon_state = "health5"
- else
- hud_used.healths.icon_state = "health6"
- else
- hud_used.healths.icon_state = "health7"
-
-/mob/living/carbon/proc/update_internals_hud_icon(internal_state = 0)
- if(hud_used && hud_used.internals)
- hud_used.internals.icon_state = "internal[internal_state]"
-
-/mob/living/carbon/update_stat()
- if(status_flags & GODMODE)
- return
- if(stat != DEAD)
- if(health <= HEALTH_THRESHOLD_DEAD && !HAS_TRAIT(src, TRAIT_NODEATH))
- death()
- return
- if(IsUnconscious() || IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || (health <= HEALTH_THRESHOLD_FULLCRIT && !HAS_TRAIT(src, TRAIT_NOHARDCRIT)))
- stat = UNCONSCIOUS
- blind_eyes(1)
- if(combatmode)
- toggle_combat_mode(TRUE, TRUE)
- else
- if(health <= crit_threshold && !HAS_TRAIT(src, TRAIT_NOSOFTCRIT))
- stat = SOFT_CRIT
- if(combatmode)
- toggle_combat_mode(TRUE, TRUE)
- else
- stat = CONSCIOUS
- adjust_blindness(-1)
- update_canmove()
- update_damage_hud()
- update_health_hud()
- med_hud_set_status()
-
-//called when we get cuffed/uncuffed
-/mob/living/carbon/proc/update_handcuffed()
- if(handcuffed)
- drop_all_held_items()
- stop_pulling()
- throw_alert("handcuffed", /obj/screen/alert/restrained/handcuffed, new_master = src.handcuffed)
- if(handcuffed.demoralize_criminals)
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "handcuffed", /datum/mood_event/handcuffed)
- else
- clear_alert("handcuffed")
- SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "handcuffed")
- update_action_buttons_icon() //some of our action buttons might be unusable when we're handcuffed.
- update_inv_handcuffed()
- update_hud_handcuffed()
-
-/mob/living/carbon/fully_heal(admin_revive = FALSE)
- if(reagents)
- reagents.clear_reagents()
- var/obj/item/organ/brain/B = getorgan(/obj/item/organ/brain)
- if(B)
- B.brain_death = FALSE
- for(var/thing in diseases)
- var/datum/disease/D = thing
- if(D.severity != DISEASE_SEVERITY_POSITIVE)
- D.cure(FALSE)
- if(admin_revive)
- regenerate_limbs()
- regenerate_organs()
- handcuffed = initial(handcuffed)
- for(var/obj/item/restraints/R in contents) //actually remove cuffs from inventory
- qdel(R)
- update_handcuffed()
- if(reagents)
- reagents.addiction_list = list()
- cure_all_traumas(TRAUMA_RESILIENCE_MAGIC)
- ..()
- // heal ears after healing traits, since ears check TRAIT_DEAF trait
- // when healing.
- restoreEars()
-
-/mob/living/carbon/can_be_revived()
- . = ..()
- if(!getorgan(/obj/item/organ/brain) && (!mind || !mind.has_antag_datum(/datum/antagonist/changeling)))
- return 0
-
-/mob/living/carbon/harvest(mob/living/user)
- if(QDELETED(src))
- return
- var/organs_amt = 0
- for(var/X in internal_organs)
- var/obj/item/organ/O = X
- if(prob(50))
- organs_amt++
- O.Remove(src)
- O.forceMove(drop_location())
- if(organs_amt)
- to_chat(user, "You retrieve some of [src]\'s internal organs!")
-
-/mob/living/carbon/ExtinguishMob()
- for(var/X in get_equipped_items())
- var/obj/item/I = X
- I.acid_level = 0 //washes off the acid on our clothes
- I.extinguish() //extinguishes our clothes
- ..()
-
-/mob/living/carbon/fakefire(var/fire_icon = "Generic_mob_burning")
- var/mutable_appearance/new_fire_overlay = mutable_appearance('icons/mob/OnFire.dmi', fire_icon, -FIRE_LAYER)
- new_fire_overlay.appearance_flags = RESET_COLOR
- overlays_standing[FIRE_LAYER] = new_fire_overlay
- apply_overlay(FIRE_LAYER)
-
-/mob/living/carbon/fakefireextinguish()
- remove_overlay(FIRE_LAYER)
-
-
-/mob/living/carbon/proc/devour_mob(mob/living/carbon/C, devour_time = 130)
- C.visible_message("[src] is attempting to devour [C]!", \
- "[src] is attempting to devour you!")
- if(!do_mob(src, C, devour_time))
- return
- if(pulling && pulling == C && grab_state >= GRAB_AGGRESSIVE && a_intent == INTENT_GRAB)
- C.visible_message("[src] devours [C]!", \
- "[src] devours you!")
- C.forceMove(src)
- stomach_contents.Add(C)
- log_combat(src, C, "devoured")
-
-/mob/living/carbon/proc/create_bodyparts()
- var/l_arm_index_next = -1
- var/r_arm_index_next = 0
- for(var/X in bodyparts)
- var/obj/item/bodypart/O = new X()
- O.owner = src
- bodyparts.Remove(X)
- bodyparts.Add(O)
- if(O.body_part == ARM_LEFT)
- l_arm_index_next += 2
- O.held_index = l_arm_index_next //1, 3, 5, 7...
- hand_bodyparts += O
- else if(O.body_part == ARM_RIGHT)
- r_arm_index_next += 2
- O.held_index = r_arm_index_next //2, 4, 6, 8...
- hand_bodyparts += O
-
-/mob/living/carbon/do_after_coefficent()
- . = ..()
- var/datum/component/mood/mood = src.GetComponent(/datum/component/mood) //Currently, only carbons or higher use mood, move this once that changes.
- if(mood)
- switch(mood.sanity) //Alters do_after delay based on how sane you are
- if(SANITY_INSANE to SANITY_DISTURBED)
- . *= 1.25
- if(SANITY_NEUTRAL to SANITY_GREAT)
- . *= 0.90
-
-
-/mob/living/carbon/proc/create_internal_organs()
- for(var/X in internal_organs)
- var/obj/item/organ/I = X
- I.Insert(src)
-
-/mob/living/carbon/proc/update_disabled_bodyparts()
- for(var/B in bodyparts)
- var/obj/item/bodypart/BP = B
- BP.update_disabled()
-
-/mob/living/carbon/vv_get_dropdown()
- . = ..()
- . += "---"
- .["Make AI"] = "?_src_=vars;[HrefToken()];makeai=[REF(src)]"
- .["Modify bodypart"] = "?_src_=vars;[HrefToken()];editbodypart=[REF(src)]"
- .["Modify organs"] = "?_src_=vars;[HrefToken()];editorgans=[REF(src)]"
- .["Hallucinate"] = "?_src_=vars;[HrefToken()];hallucinate=[REF(src)]"
- .["Give martial arts"] = "?_src_=vars;[HrefToken()];givemartialart=[REF(src)]"
- .["Give brain trauma"] = "?_src_=vars;[HrefToken()];givetrauma=[REF(src)]"
- .["Cure brain traumas"] = "?_src_=vars;[HrefToken()];curetraumas=[REF(src)]"
-
-/mob/living/carbon/can_resist()
- return bodyparts.len > 2 && ..()
-
-/mob/living/carbon/proc/hypnosis_vulnerable()//unused atm, but added in case
- if(HAS_TRAIT(src, TRAIT_MINDSHIELD))
- return FALSE
- if(hallucinating())
- return TRUE
- if(IsSleeping())
- return TRUE
- if(HAS_TRAIT(src, TRAIT_DUMB))
- return TRUE
- var/datum/component/mood/mood = src.GetComponent(/datum/component/mood)
- if(mood)
- if(mood.sanity < SANITY_UNSTABLE)
- return TRUE
-
-/mob/living/carbon/transfer_ckey(mob/new_mob, send_signal = TRUE)
- if(combatmode)
- toggle_combat_mode(TRUE, TRUE)
- return ..()
-
-/mob/living/carbon/can_see_reagents()
- . = ..()
- if(.) //No need to run through all of this if it's already true.
- return
- if(isclothing(head))
- var/obj/item/clothing/H = head
- if(H.clothing_flags & SCAN_REAGENTS)
- return TRUE
- if(isclothing(wear_mask) && (wear_mask.clothing_flags & SCAN_REAGENTS))
- return TRUE
+/mob/living/carbon
+ blood_volume = BLOOD_VOLUME_NORMAL
+
+/mob/living/carbon/Initialize()
+ . = ..()
+ create_reagents(1000)
+ update_body_parts() //to update the carbon's new bodyparts appearance
+ GLOB.carbon_list += src
+ blood_volume = (BLOOD_VOLUME_NORMAL * blood_ratio)
+
+/mob/living/carbon/Destroy()
+ //This must be done first, so the mob ghosts correctly before DNA etc is nulled
+ . = ..()
+
+ QDEL_LIST(internal_organs)
+ QDEL_LIST(stomach_contents)
+ QDEL_LIST(bodyparts)
+ QDEL_LIST(implants)
+ remove_from_all_data_huds()
+ QDEL_NULL(dna)
+ GLOB.carbon_list -= src
+
+/mob/living/carbon/initialize_footstep()
+ AddComponent(/datum/component/footstep, 0.6, 2)
+
+/mob/living/carbon/relaymove(mob/user, direction)
+ if(user in src.stomach_contents)
+ if(prob(40))
+ if(prob(25))
+ audible_message("You hear something rumbling inside [src]'s stomach...", \
+ "You hear something rumbling.", 4,\
+ "Something is rumbling inside your stomach!")
+ var/obj/item/I = user.get_active_held_item()
+ if(I && I.force)
+ var/d = rand(round(I.force / 4), I.force)
+ var/obj/item/bodypart/BP = get_bodypart(BODY_ZONE_CHEST)
+ if(BP.receive_damage(d, 0))
+ update_damage_overlays()
+ visible_message("[user] attacks [src]'s stomach wall with the [I.name]!", \
+ "[user] attacks your stomach wall with the [I.name]!")
+ playsound(user.loc, 'sound/effects/attackblob.ogg', 50, 1)
+
+ if(prob(src.getBruteLoss() - 50))
+ for(var/atom/movable/A in stomach_contents)
+ A.forceMove(drop_location())
+ stomach_contents.Remove(A)
+ src.gib()
+
+
+/mob/living/carbon/swap_hand(held_index)
+ if(!held_index)
+ held_index = (active_hand_index % held_items.len)+1
+
+ var/obj/item/item_in_hand = src.get_active_held_item()
+ if(item_in_hand) //this segment checks if the item in your hand is twohanded.
+ var/obj/item/twohanded/TH = item_in_hand
+ if(istype(TH))
+ if(TH.wielded == 1)
+ to_chat(usr, "Your other hand is too busy holding [TH]")
+ return
+ var/oindex = active_hand_index
+ active_hand_index = held_index
+ if(hud_used)
+ var/obj/screen/inventory/hand/H
+ H = hud_used.hand_slots["[oindex]"]
+ if(H)
+ H.update_icon()
+ H = hud_used.hand_slots["[held_index]"]
+ if(H)
+ H.update_icon()
+
+
+/mob/living/carbon/activate_hand(selhand) //l/r OR 1-held_items.len
+ if(!selhand)
+ selhand = (active_hand_index % held_items.len)+1
+
+ if(istext(selhand))
+ selhand = lowertext(selhand)
+ if(selhand == "right" || selhand == "r")
+ selhand = 2
+ if(selhand == "left" || selhand == "l")
+ selhand = 1
+
+ if(selhand != active_hand_index)
+ swap_hand(selhand)
+ else
+ mode() // Activate held item
+
+/mob/living/carbon/attackby(obj/item/I, mob/user, params)
+ if(lying && surgeries.len)
+ if(user != src && (user.a_intent == INTENT_HELP || user.a_intent == INTENT_DISARM))
+ for(var/datum/surgery/S in surgeries)
+ if(S.next_step(user,user.a_intent))
+ return 1
+ return ..()
+
+/mob/living/carbon/throw_impact(atom/hit_atom, throwingdatum)
+ . = ..()
+ var/hurt = TRUE
+ if(istype(throwingdatum, /datum/thrownthing))
+ var/datum/thrownthing/D = throwingdatum
+ if(iscyborg(D.thrower))
+ var/mob/living/silicon/robot/R = D.thrower
+ if(!R.emagged)
+ hurt = FALSE
+ if(hit_atom.density && isturf(hit_atom))
+ if(hurt)
+ Knockdown(20)
+ take_bodypart_damage(10)
+ if(iscarbon(hit_atom) && hit_atom != src)
+ var/mob/living/carbon/victim = hit_atom
+ if(victim.movement_type & FLYING)
+ return
+ if(hurt)
+ victim.take_bodypart_damage(10)
+ take_bodypart_damage(10)
+ victim.Knockdown(20)
+ Knockdown(20)
+ visible_message("[src] crashes into [victim], knocking them both over!",\
+ "You violently crash into [victim]!")
+ playsound(src,'sound/weapons/punch1.ogg',50,1)
+
+
+//Throwing stuff
+/mob/living/carbon/proc/toggle_throw_mode()
+ if(stat)
+ return
+ if(in_throw_mode)
+ throw_mode_off()
+ else
+ throw_mode_on()
+
+
+/mob/living/carbon/proc/throw_mode_off()
+ in_throw_mode = 0
+ if(client && hud_used)
+ hud_used.throw_icon.icon_state = "act_throw_off"
+
+
+/mob/living/carbon/proc/throw_mode_on()
+ in_throw_mode = 1
+ if(client && hud_used)
+ hud_used.throw_icon.icon_state = "act_throw_on"
+
+/mob/proc/throw_item(atom/target)
+ SEND_SIGNAL(src, COMSIG_MOB_THROW, target)
+ return
+
+/mob/living/carbon/throw_item(atom/target)
+ throw_mode_off()
+ if(!target || !isturf(loc))
+ return
+ if(istype(target, /obj/screen))
+ return
+
+ //CIT CHANGES - makes it impossible to throw while in stamina softcrit
+ if(getStaminaLoss() >= STAMINA_SOFTCRIT)
+ to_chat(src, "You're too exhausted.")
+ return
+ var/random_turn = a_intent == INTENT_HARM
+ //END OF CIT CHANGES
+
+ var/obj/item/I = src.get_active_held_item()
+
+ var/atom/movable/thrown_thing
+ var/mob/living/throwable_mob
+
+ if(istype(I, /obj/item/clothing/head/mob_holder))
+ var/obj/item/clothing/head/mob_holder/holder = I
+ if(holder.held_mob)
+ throwable_mob = holder.held_mob
+ holder.release()
+
+ if(!I || throwable_mob)
+ if(!throwable_mob && pulling && isliving(pulling) && grab_state >= GRAB_AGGRESSIVE)
+ throwable_mob = pulling
+
+ if(throwable_mob && !throwable_mob.buckled)
+ thrown_thing = throwable_mob
+ if(pulling)
+ stop_pulling()
+ if(HAS_TRAIT(src, TRAIT_PACIFISM))
+ to_chat(src, "You gently let go of [throwable_mob].")
+ return
+
+ adjustStaminaLossBuffered(25)//CIT CHANGE - throwing an entire person shall be very tiring
+ var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
+ var/turf/end_T = get_turf(target)
+ if(start_T && end_T)
+ log_combat(src, throwable_mob, "thrown", addition="grab from tile in [AREACOORD(start_T)] towards tile at [AREACOORD(end_T)]")
+
+ else if(!CHECK_BITFIELD(I.item_flags, ABSTRACT) && !HAS_TRAIT(I, TRAIT_NODROP))
+ thrown_thing = I
+ dropItemToGround(I)
+
+ if(HAS_TRAIT(src, TRAIT_PACIFISM) && I.throwforce)
+ to_chat(src, "You set [I] down gently on the ground.")
+ return
+
+ adjustStaminaLossBuffered(I.getweight()*2)//CIT CHANGE - throwing items shall be more tiring than swinging em. Doubly so.
+
+ if(thrown_thing)
+ visible_message("[src] has thrown [thrown_thing].")
+ src.log_message("has thrown [thrown_thing]", LOG_ATTACK)
+ do_attack_animation(target, no_effect = 1)
+ playsound(loc, 'sound/weapons/punchmiss.ogg', 50, 1, -1)
+ newtonian_move(get_dir(target, src))
+ thrown_thing.throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed, src, null, null, null, random_turn)
+
+
+
+/mob/living/carbon/restrained(ignore_grab)
+ . = (handcuffed || (!ignore_grab && pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE))
+
+/mob/living/carbon/proc/canBeHandcuffed()
+ return 0
+
+
+/mob/living/carbon/show_inv(mob/user)
+ user.set_machine(src)
+ var/dat = {"
+
+ [name]
+
+
Head: [(head && !(head.item_flags & ABSTRACT)) ? head : "Nothing"]
+
Mask: [(wear_mask && !(wear_mask.item_flags & ABSTRACT)) ? wear_mask : "Nothing"]
+
Neck: [(wear_neck && !(wear_neck.item_flags & ABSTRACT)) ? wear_neck : "Nothing"]"}
+
+ for(var/i in 1 to held_items.len)
+ var/obj/item/I = get_item_for_held_index(i)
+ dat += "
[get_held_index_name(i)]: | [(I && !(I.item_flags & ABSTRACT)) ? I : "Nothing"]"
+
+ dat += "
Back: [back ? back : "Nothing"]"
+
+ if(istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/tank))
+ dat += "
[internal ? "Disable Internals" : "Set Internals"]"
+
+ if(handcuffed)
+ dat += "
Handcuffed"
+ if(legcuffed)
+ dat += "
Legcuffed"
+
+ dat += {"
+
+
Close
+ "}
+ user << browse(dat, "window=mob[REF(src)];size=325x500")
+ onclose(user, "mob[REF(src)]")
+
+/mob/living/carbon/Topic(href, href_list)
+ ..()
+ //strip panel
+ if(usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
+ if(href_list["internal"])
+ var/slot = text2num(href_list["internal"])
+ var/obj/item/ITEM = get_item_by_slot(slot)
+ if(ITEM && istype(ITEM, /obj/item/tank) && wear_mask && (wear_mask.clothing_flags & ALLOWINTERNALS))
+ visible_message("[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].", \
+ "[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].")
+ if(do_mob(usr, src, POCKET_STRIP_DELAY))
+ if(internal)
+ internal = null
+ update_internals_hud_icon(0)
+ else if(ITEM && istype(ITEM, /obj/item/tank))
+ if((wear_mask && (wear_mask.clothing_flags & ALLOWINTERNALS)) || getorganslot(ORGAN_SLOT_BREATHING_TUBE))
+ internal = ITEM
+ update_internals_hud_icon(1)
+
+ visible_message("[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name].", \
+ "[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name].")
+
+
+/mob/living/carbon/fall(forced)
+ loc.handle_fall(src, forced)//it's loc so it doesn't call the mob's handle_fall which does nothing
+
+/mob/living/carbon/is_muzzled()
+ return(istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
+
+/mob/living/carbon/hallucinating()
+ if(hallucination)
+ return TRUE
+ else
+ return FALSE
+
+/mob/living/carbon/resist_buckle()
+ if(restrained())
+ changeNext_move(CLICK_CD_BREAKOUT)
+ last_special = world.time + CLICK_CD_BREAKOUT
+ var/buckle_cd = 600
+ if(handcuffed)
+ var/obj/item/restraints/O = src.get_item_by_slot(SLOT_HANDCUFFED)
+ buckle_cd = O.breakouttime
+ visible_message("[src] attempts to unbuckle [p_them()]self!", \
+ "You attempt to unbuckle yourself... (This will take around [round(buckle_cd/600,1)] minute\s, and you need to stay still.)")
+ if(do_after(src, buckle_cd, 0, target = src))
+ if(!buckled)
+ return
+ buckled.user_unbuckle_mob(src,src)
+ else
+ if(src && buckled)
+ to_chat(src, "You fail to unbuckle yourself!")
+ else
+ buckled.user_unbuckle_mob(src,src)
+
+/mob/living/carbon/resist_fire()
+ fire_stacks -= 5
+ Knockdown(60, TRUE, TRUE)
+ spin(32,2)
+ visible_message("[src] rolls on the floor, trying to put [p_them()]self out!", \
+ "You stop, drop, and roll!")
+ sleep(30)
+ if(fire_stacks <= 0)
+ visible_message("[src] has successfully extinguished [p_them()]self!", \
+ "You extinguish yourself.")
+ ExtinguishMob()
+ return
+
+/mob/living/carbon/resist_restraints()
+ var/obj/item/I = null
+ var/type = 0
+ if(handcuffed)
+ I = handcuffed
+ type = 1
+ else if(legcuffed)
+ I = legcuffed
+ type = 2
+ if(I)
+ if(type == 1)
+ changeNext_move(CLICK_CD_BREAKOUT)
+ last_special = world.time + CLICK_CD_BREAKOUT
+ if(type == 2)
+ changeNext_move(CLICK_CD_RANGE)
+ last_special = world.time + CLICK_CD_RANGE
+ cuff_resist(I)
+
+
+/mob/living/carbon/proc/cuff_resist(obj/item/I, breakouttime = 600, cuff_break = 0)
+ if(I.item_flags & BEING_REMOVED)
+ to_chat(src, "You're already attempting to remove [I]!")
+ return
+ I.item_flags |= BEING_REMOVED
+ breakouttime = I.breakouttime
+ if(!cuff_break)
+ visible_message("[src] attempts to remove [I]!")
+ to_chat(src, "You attempt to remove [I]... (This will take around [DisplayTimeText(breakouttime)] and you need to stand still.)")
+ if(do_after(src, breakouttime, 0, target = src))
+ clear_cuffs(I, cuff_break)
+ else
+ to_chat(src, "You fail to remove [I]!")
+
+ else if(cuff_break == FAST_CUFFBREAK)
+ breakouttime = 50
+ visible_message("[src] is trying to break [I]!")
+ to_chat(src, "You attempt to break [I]... (This will take around 5 seconds and you need to stand still.)")
+ if(do_after(src, breakouttime, 0, target = src))
+ clear_cuffs(I, cuff_break)
+ else
+ to_chat(src, "You fail to break [I]!")
+
+ else if(cuff_break == INSTANT_CUFFBREAK)
+ clear_cuffs(I, cuff_break)
+ I.item_flags &= ~BEING_REMOVED
+
+/mob/living/carbon/proc/uncuff()
+ if (handcuffed)
+ var/obj/item/W = handcuffed
+ handcuffed = null
+ if (buckled && buckled.buckle_requires_restraints)
+ buckled.unbuckle_mob(src)
+ update_handcuffed()
+ if (client)
+ client.screen -= W
+ if (W)
+ W.forceMove(drop_location())
+ W.dropped(src)
+ if (W)
+ W.layer = initial(W.layer)
+ W.plane = initial(W.plane)
+ changeNext_move(0)
+ if (legcuffed)
+ var/obj/item/W = legcuffed
+ legcuffed = null
+ update_inv_legcuffed()
+ if (client)
+ client.screen -= W
+ if (W)
+ W.forceMove(drop_location())
+ W.dropped(src)
+ if (W)
+ W.layer = initial(W.layer)
+ W.plane = initial(W.plane)
+ changeNext_move(0)
+
+/mob/living/carbon/proc/clear_cuffs(obj/item/I, cuff_break)
+ if(!I.loc || buckled)
+ return
+ visible_message("[src] manages to [cuff_break ? "break" : "remove"] [I]!")
+ to_chat(src, "You successfully [cuff_break ? "break" : "remove"] [I].")
+
+ if(cuff_break)
+ . = !((I == handcuffed) || (I == legcuffed))
+ qdel(I)
+ return
+
+ else
+ if(I == handcuffed)
+ handcuffed.forceMove(drop_location())
+ handcuffed.dropped(src)
+ handcuffed = null
+ if(buckled && buckled.buckle_requires_restraints)
+ buckled.unbuckle_mob(src)
+ update_handcuffed()
+ return
+ if(I == legcuffed)
+ legcuffed.forceMove(drop_location())
+ legcuffed.dropped()
+ legcuffed = null
+ update_inv_legcuffed()
+ return
+ else
+ dropItemToGround(I)
+ return
+ return TRUE
+
+/mob/living/carbon/get_standard_pixel_y_offset(lying = 0)
+ if(lying)
+ return -6
+ else
+ return initial(pixel_y)
+
+/mob/living/carbon/proc/accident(obj/item/I)
+ if(!I || (I.item_flags & ABSTRACT) || HAS_TRAIT(I, TRAIT_NODROP))
+ return
+
+ //dropItemToGround(I) CIT CHANGE - makes it so the item doesn't drop if the modifier rolls above 100
+
+ var/modifier = 0
+
+ if(HAS_TRAIT(src, TRAIT_CLUMSY))
+ modifier -= 40 //Clumsy people are more likely to hit themselves -Honk!
+
+ //CIT CHANGES START HERE
+ else if(combatmode)
+ modifier += 50
+
+ if(modifier < 100)
+ dropItemToGround(I)
+ //END OF CIT CHANGES
+
+ switch(rand(1,100)+modifier) //91-100=Nothing special happens
+ if(-INFINITY to 0) //attack yourself
+ I.attack(src,src)
+ if(1 to 30) //throw it at yourself
+ I.throw_impact(src)
+ if(31 to 60) //Throw object in facing direction
+ var/turf/target = get_turf(loc)
+ var/range = rand(2,I.throw_range)
+ for(var/i = 1; i < range; i++)
+ var/turf/new_turf = get_step(target, dir)
+ target = new_turf
+ if(new_turf.density)
+ break
+ I.throw_at(target,I.throw_range,I.throw_speed,src)
+ if(61 to 90) //throw it down to the floor
+ var/turf/target = get_turf(loc)
+ I.throw_at(target,I.throw_range,I.throw_speed,src)
+
+/mob/living/carbon/Stat()
+ ..()
+ if(statpanel("Status"))
+ var/obj/item/organ/alien/plasmavessel/vessel = getorgan(/obj/item/organ/alien/plasmavessel)
+ if(vessel)
+ stat(null, "Plasma Stored: [vessel.storedPlasma]/[vessel.max_plasma]")
+ if(locate(/obj/item/assembly/health) in src)
+ stat(null, "Health: [health]")
+
+ add_abilities_to_panel()
+
+/mob/living/carbon/attack_ui(slot)
+ if(!has_hand_for_held_index(active_hand_index))
+ return 0
+ return ..()
+
+/mob/living/carbon/proc/vomit(lost_nutrition = 10, blood = FALSE, stun = TRUE, distance = 1, message = TRUE, toxic = FALSE)
+ if(HAS_TRAIT(src, TRAIT_NOHUNGER))
+ return 1
+
+ if(nutrition < 100 && !blood)
+ if(message)
+ visible_message("[src] dry heaves!", \
+ "You try to throw up, but there's nothing in your stomach!")
+ if(stun)
+ Knockdown(200)
+ return 1
+
+ if(is_mouth_covered()) //make this add a blood/vomit overlay later it'll be hilarious
+ if(message)
+ visible_message("[src] throws up all over [p_them()]self!", \
+ "You throw up all over yourself!")
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "vomit", /datum/mood_event/vomitself)
+ distance = 0
+ else
+ if(message)
+ visible_message("[src] throws up!", "You throw up!")
+ if(!isflyperson(src))
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "vomit", /datum/mood_event/vomit)
+ if(stun)
+ Stun(80)
+
+ playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1)
+ var/turf/T = get_turf(src)
+ if(!blood)
+ nutrition -= lost_nutrition
+ adjustToxLoss(-3)
+ for(var/i=0 to distance)
+ if(blood)
+ if(T)
+ add_splatter_floor(T)
+ if(stun)
+ adjustBruteLoss(3)
+ else if(src.reagents.has_reagent("blazaam"))
+ if(T)
+ T.add_vomit_floor(src, VOMIT_PURPLE)
+ else
+ if(T)
+ T.add_vomit_floor(src, VOMIT_TOXIC)//toxic barf looks different
+ T = get_step(T, dir)
+ if (is_blocked_turf(T))
+ break
+ return 1
+
+/mob/living/carbon/proc/spew_organ(power = 5, amt = 1)
+ for(var/i in 1 to amt)
+ if(!internal_organs.len)
+ break //Guess we're out of organs!
+ var/obj/item/organ/guts = pick(internal_organs)
+ var/turf/T = get_turf(src)
+ guts.Remove(src)
+ guts.forceMove(T)
+ var/atom/throw_target = get_edge_target_turf(guts, dir)
+ guts.throw_at(throw_target, power, 4, src)
+
+
+/mob/living/carbon/fully_replace_character_name(oldname,newname)
+ ..()
+ if(dna)
+ dna.real_name = real_name
+
+//Updates the mob's health from bodyparts and mob damage variables
+/mob/living/carbon/updatehealth()
+ if(status_flags & GODMODE)
+ return
+ var/total_burn = 0
+ var/total_brute = 0
+ var/total_stamina = 0
+ for(var/X in bodyparts) //hardcoded to streamline things a bit
+ var/obj/item/bodypart/BP = X
+ total_brute += (BP.brute_dam * BP.body_damage_coeff)
+ total_burn += (BP.burn_dam * BP.body_damage_coeff)
+ total_stamina += (BP.stamina_dam * BP.stam_damage_coeff)
+ health = round(maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute, DAMAGE_PRECISION)
+ staminaloss = round(total_stamina, DAMAGE_PRECISION)
+ update_stat()
+ if(((maxHealth - total_burn) < HEALTH_THRESHOLD_DEAD) && stat == DEAD )
+ become_husk("burn")
+ med_hud_set_health()
+ if(stat == SOFT_CRIT)
+ add_movespeed_modifier(MOVESPEED_ID_CARBON_SOFTCRIT, TRUE, multiplicative_slowdown = SOFTCRIT_ADD_SLOWDOWN)
+ else
+ remove_movespeed_modifier(MOVESPEED_ID_CARBON_SOFTCRIT, TRUE)
+
+/mob/living/carbon/update_stamina()
+ var/stam = getStaminaLoss()
+ if(stam > DAMAGE_PRECISION)
+ var/total_health = (health - stam)
+ if(total_health <= crit_threshold && !stat)
+ if(!IsKnockdown())
+ to_chat(src, "You're too exhausted to keep going...")
+ Knockdown(100)
+ update_health_hud()
+
+/mob/living/carbon/update_sight()
+ if(!client)
+ return
+ if(stat == DEAD)
+ sight = (SEE_TURFS|SEE_MOBS|SEE_OBJS)
+ see_in_dark = 8
+ see_invisible = SEE_INVISIBLE_OBSERVER
+ return
+
+ sight = initial(sight)
+ lighting_alpha = initial(lighting_alpha)
+ var/obj/item/organ/eyes/E = getorganslot(ORGAN_SLOT_EYES)
+ if(!E)
+ update_tint()
+ else
+ see_invisible = E.see_invisible
+ see_in_dark = E.see_in_dark
+ sight |= E.sight_flags
+ if(!isnull(E.lighting_alpha))
+ lighting_alpha = E.lighting_alpha
+ if(HAS_TRAIT(src, TRAIT_NIGHT_VISION))
+ lighting_alpha = min(LIGHTING_PLANE_ALPHA_NV_TRAIT, lighting_alpha)
+ see_in_dark = max(NIGHT_VISION_DARKSIGHT_RANGE, see_in_dark)
+
+ if(client.eye && client.eye != src)
+ var/atom/A = client.eye
+ if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates.
+ return
+
+ if(glasses)
+ var/obj/item/clothing/glasses/G = glasses
+ sight |= G.vision_flags
+ see_in_dark = max(G.darkness_view, see_in_dark)
+ if(G.invis_override)
+ see_invisible = G.invis_override
+ else
+ see_invisible = min(G.invis_view, see_invisible)
+ if(!isnull(G.lighting_alpha))
+ lighting_alpha = min(lighting_alpha, G.lighting_alpha)
+ if(dna)
+ for(var/X in dna.mutations)
+ var/datum/mutation/M = X
+ if(M.name == XRAY)
+ sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
+ see_in_dark = max(see_in_dark, 8)
+
+ if(see_override)
+ see_invisible = see_override
+ . = ..()
+
+
+//to recalculate and update the mob's total tint from tinted equipment it's wearing.
+/mob/living/carbon/proc/update_tint()
+ if(!GLOB.tinted_weldhelh)
+ return
+ tinttotal = get_total_tint()
+ if(tinttotal >= TINT_BLIND)
+ become_blind(EYES_COVERED)
+ else if(tinttotal >= TINT_DARKENED)
+ cure_blind(EYES_COVERED)
+ overlay_fullscreen("tint", /obj/screen/fullscreen/impaired, 2)
+ else
+ cure_blind(EYES_COVERED)
+ clear_fullscreen("tint", 0)
+
+/mob/living/carbon/proc/get_total_tint()
+ . = 0
+ if(istype(head, /obj/item/clothing/head))
+ var/obj/item/clothing/head/HT = head
+ . += HT.tint
+ if(wear_mask)
+ . += wear_mask.tint
+
+ var/obj/item/organ/eyes/E = getorganslot(ORGAN_SLOT_EYES)
+ if(E)
+ . += E.tint
+
+ else
+ . += INFINITY
+
+/mob/living/carbon/get_permeability_protection(list/target_zones = list(HANDS,CHEST,GROIN,LEGS,FEET,ARMS,HEAD))
+ var/list/tally = list()
+ for(var/obj/item/I in get_equipped_items())
+ for(var/zone in target_zones)
+ if(I.body_parts_covered & zone)
+ tally["[zone]"] = max(1 - I.permeability_coefficient, target_zones["[zone]"])
+ var/protection = 0
+ for(var/key in tally)
+ protection += tally[key]
+ protection *= INVERSE(target_zones.len)
+ return protection
+
+//this handles hud updates
+/mob/living/carbon/update_damage_hud()
+
+ if(!client)
+ return
+
+ if(health <= crit_threshold)
+ var/severity = 0
+ switch(health)
+ if(-20 to -10)
+ severity = 1
+ if(-30 to -20)
+ severity = 2
+ if(-40 to -30)
+ severity = 3
+ if(-50 to -40)
+ severity = 4
+ if(-50 to -40)
+ severity = 5
+ if(-60 to -50)
+ severity = 6
+ if(-70 to -60)
+ severity = 7
+ if(-90 to -70)
+ severity = 8
+ if(-95 to -90)
+ severity = 9
+ if(-INFINITY to -95)
+ severity = 10
+ if(!InFullCritical())
+ var/visionseverity = 4
+ switch(health)
+ if(-8 to -4)
+ visionseverity = 5
+ if(-12 to -8)
+ visionseverity = 6
+ if(-16 to -12)
+ visionseverity = 7
+ if(-20 to -16)
+ visionseverity = 8
+ if(-24 to -20)
+ visionseverity = 9
+ if(-INFINITY to -24)
+ visionseverity = 10
+ overlay_fullscreen("critvision", /obj/screen/fullscreen/crit/vision, visionseverity)
+ else
+ clear_fullscreen("critvision")
+ overlay_fullscreen("crit", /obj/screen/fullscreen/crit, severity)
+ else
+ clear_fullscreen("crit")
+ clear_fullscreen("critvision")
+
+ //Oxygen damage overlay
+ var/windedup = getOxyLoss() + getStaminaLoss() * 0.2
+ if(windedup)
+ var/severity = 0
+ switch(windedup)
+ if(10 to 20)
+ severity = 1
+ if(20 to 25)
+ severity = 2
+ if(25 to 30)
+ severity = 3
+ if(30 to 35)
+ severity = 4
+ if(35 to 40)
+ severity = 5
+ if(40 to 45)
+ severity = 6
+ if(45 to INFINITY)
+ severity = 7
+ overlay_fullscreen("oxy", /obj/screen/fullscreen/oxy, severity)
+ else
+ clear_fullscreen("oxy")
+
+ //Fire and Brute damage overlay (BSSR)
+ var/hurtdamage = getBruteLoss() + getFireLoss() + damageoverlaytemp
+ if(hurtdamage)
+ var/severity = 0
+ switch(hurtdamage)
+ if(5 to 15)
+ severity = 1
+ if(15 to 30)
+ severity = 2
+ if(30 to 45)
+ severity = 3
+ if(45 to 70)
+ severity = 4
+ if(70 to 85)
+ severity = 5
+ if(85 to INFINITY)
+ severity = 6
+ overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity)
+ else
+ clear_fullscreen("brute")
+
+/mob/living/carbon/update_health_hud(shown_health_amount)
+ if(!client || !hud_used)
+ return
+ if(hud_used.healths)
+ if(stat != DEAD)
+ . = 1
+ if(!shown_health_amount)
+ shown_health_amount = health
+ if(shown_health_amount >= maxHealth)
+ hud_used.healths.icon_state = "health0"
+ else if(shown_health_amount > maxHealth*0.8)
+ hud_used.healths.icon_state = "health1"
+ else if(shown_health_amount > maxHealth*0.6)
+ hud_used.healths.icon_state = "health2"
+ else if(shown_health_amount > maxHealth*0.4)
+ hud_used.healths.icon_state = "health3"
+ else if(shown_health_amount > maxHealth*0.2)
+ hud_used.healths.icon_state = "health4"
+ else if(shown_health_amount > 0)
+ hud_used.healths.icon_state = "health5"
+ else
+ hud_used.healths.icon_state = "health6"
+ else
+ hud_used.healths.icon_state = "health7"
+
+/mob/living/carbon/proc/update_internals_hud_icon(internal_state = 0)
+ if(hud_used && hud_used.internals)
+ hud_used.internals.icon_state = "internal[internal_state]"
+
+/mob/living/carbon/update_stat()
+ if(status_flags & GODMODE)
+ return
+ if(stat != DEAD)
+ if(health <= HEALTH_THRESHOLD_DEAD && !HAS_TRAIT(src, TRAIT_NODEATH))
+ death()
+ return
+ if(IsUnconscious() || IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || (health <= HEALTH_THRESHOLD_FULLCRIT && !HAS_TRAIT(src, TRAIT_NOHARDCRIT)))
+ stat = UNCONSCIOUS
+ blind_eyes(1)
+ if(combatmode)
+ toggle_combat_mode(TRUE, TRUE)
+ else
+ if(health <= crit_threshold && !HAS_TRAIT(src, TRAIT_NOSOFTCRIT))
+ stat = SOFT_CRIT
+ if(combatmode)
+ toggle_combat_mode(TRUE, TRUE)
+ else
+ stat = CONSCIOUS
+ adjust_blindness(-1)
+ update_canmove()
+ update_damage_hud()
+ update_health_hud()
+ med_hud_set_status()
+
+//called when we get cuffed/uncuffed
+/mob/living/carbon/proc/update_handcuffed()
+ if(handcuffed)
+ drop_all_held_items()
+ stop_pulling()
+ throw_alert("handcuffed", /obj/screen/alert/restrained/handcuffed, new_master = src.handcuffed)
+ if(handcuffed.demoralize_criminals)
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "handcuffed", /datum/mood_event/handcuffed)
+ else
+ clear_alert("handcuffed")
+ SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "handcuffed")
+ update_action_buttons_icon() //some of our action buttons might be unusable when we're handcuffed.
+ update_inv_handcuffed()
+ update_hud_handcuffed()
+
+/mob/living/carbon/fully_heal(admin_revive = FALSE)
+ if(reagents)
+ reagents.clear_reagents()
+ var/obj/item/organ/brain/B = getorgan(/obj/item/organ/brain)
+ if(B)
+ B.brain_death = FALSE
+ for(var/thing in diseases)
+ var/datum/disease/D = thing
+ if(D.severity != DISEASE_SEVERITY_POSITIVE)
+ D.cure(FALSE)
+ if(admin_revive)
+ regenerate_limbs()
+ regenerate_organs()
+ handcuffed = initial(handcuffed)
+ for(var/obj/item/restraints/R in contents) //actually remove cuffs from inventory
+ qdel(R)
+ update_handcuffed()
+ if(reagents)
+ reagents.addiction_list = list()
+ cure_all_traumas(TRAUMA_RESILIENCE_MAGIC)
+ ..()
+ // heal ears after healing traits, since ears check TRAIT_DEAF trait
+ // when healing.
+ restoreEars()
+
+/mob/living/carbon/can_be_revived()
+ . = ..()
+ if(!getorgan(/obj/item/organ/brain) && (!mind || !mind.has_antag_datum(/datum/antagonist/changeling)))
+ return 0
+
+/mob/living/carbon/harvest(mob/living/user)
+ if(QDELETED(src))
+ return
+ var/organs_amt = 0
+ for(var/X in internal_organs)
+ var/obj/item/organ/O = X
+ if(prob(50))
+ organs_amt++
+ O.Remove(src)
+ O.forceMove(drop_location())
+ if(organs_amt)
+ to_chat(user, "You retrieve some of [src]\'s internal organs!")
+
+/mob/living/carbon/ExtinguishMob()
+ for(var/X in get_equipped_items())
+ var/obj/item/I = X
+ I.acid_level = 0 //washes off the acid on our clothes
+ I.extinguish() //extinguishes our clothes
+ ..()
+
+/mob/living/carbon/fakefire(var/fire_icon = "Generic_mob_burning")
+ var/mutable_appearance/new_fire_overlay = mutable_appearance('icons/mob/OnFire.dmi', fire_icon, -FIRE_LAYER)
+ new_fire_overlay.appearance_flags = RESET_COLOR
+ overlays_standing[FIRE_LAYER] = new_fire_overlay
+ apply_overlay(FIRE_LAYER)
+
+/mob/living/carbon/fakefireextinguish()
+ remove_overlay(FIRE_LAYER)
+
+
+/mob/living/carbon/proc/devour_mob(mob/living/carbon/C, devour_time = 130)
+ C.visible_message("[src] is attempting to devour [C]!", \
+ "[src] is attempting to devour you!")
+ if(!do_mob(src, C, devour_time))
+ return
+ if(pulling && pulling == C && grab_state >= GRAB_AGGRESSIVE && a_intent == INTENT_GRAB)
+ C.visible_message("[src] devours [C]!", \
+ "[src] devours you!")
+ C.forceMove(src)
+ stomach_contents.Add(C)
+ log_combat(src, C, "devoured")
+
+/mob/living/carbon/proc/create_bodyparts()
+ var/l_arm_index_next = -1
+ var/r_arm_index_next = 0
+ for(var/X in bodyparts)
+ var/obj/item/bodypart/O = new X()
+ O.owner = src
+ bodyparts.Remove(X)
+ bodyparts.Add(O)
+ if(O.body_part == ARM_LEFT)
+ l_arm_index_next += 2
+ O.held_index = l_arm_index_next //1, 3, 5, 7...
+ hand_bodyparts += O
+ else if(O.body_part == ARM_RIGHT)
+ r_arm_index_next += 2
+ O.held_index = r_arm_index_next //2, 4, 6, 8...
+ hand_bodyparts += O
+
+/mob/living/carbon/do_after_coefficent()
+ . = ..()
+ var/datum/component/mood/mood = src.GetComponent(/datum/component/mood) //Currently, only carbons or higher use mood, move this once that changes.
+ if(mood)
+ switch(mood.sanity) //Alters do_after delay based on how sane you are
+ if(SANITY_INSANE to SANITY_DISTURBED)
+ . *= 1.25
+ if(SANITY_NEUTRAL to SANITY_GREAT)
+ . *= 0.90
+
+
+/mob/living/carbon/proc/create_internal_organs()
+ for(var/X in internal_organs)
+ var/obj/item/organ/I = X
+ I.Insert(src)
+
+/mob/living/carbon/proc/update_disabled_bodyparts()
+ for(var/B in bodyparts)
+ var/obj/item/bodypart/BP = B
+ BP.update_disabled()
+
+/mob/living/carbon/vv_get_dropdown()
+ . = ..()
+ . += "---"
+ .["Make AI"] = "?_src_=vars;[HrefToken()];makeai=[REF(src)]"
+ .["Modify bodypart"] = "?_src_=vars;[HrefToken()];editbodypart=[REF(src)]"
+ .["Modify organs"] = "?_src_=vars;[HrefToken()];editorgans=[REF(src)]"
+ .["Hallucinate"] = "?_src_=vars;[HrefToken()];hallucinate=[REF(src)]"
+ .["Give martial arts"] = "?_src_=vars;[HrefToken()];givemartialart=[REF(src)]"
+ .["Give brain trauma"] = "?_src_=vars;[HrefToken()];givetrauma=[REF(src)]"
+ .["Cure brain traumas"] = "?_src_=vars;[HrefToken()];curetraumas=[REF(src)]"
+
+/mob/living/carbon/can_resist()
+ return bodyparts.len > 2 && ..()
+
+/mob/living/carbon/proc/hypnosis_vulnerable()//unused atm, but added in case
+ if(HAS_TRAIT(src, TRAIT_MINDSHIELD))
+ return FALSE
+ if(hallucinating())
+ return TRUE
+ if(IsSleeping())
+ return TRUE
+ if(HAS_TRAIT(src, TRAIT_DUMB))
+ return TRUE
+ var/datum/component/mood/mood = src.GetComponent(/datum/component/mood)
+ if(mood)
+ if(mood.sanity < SANITY_UNSTABLE)
+ return TRUE
+
+/mob/living/carbon/transfer_ckey(mob/new_mob, send_signal = TRUE)
+ if(combatmode)
+ toggle_combat_mode(TRUE, TRUE)
+ return ..()
+
+/mob/living/carbon/can_see_reagents()
+ . = ..()
+ if(.) //No need to run through all of this if it's already true.
+ return
+ if(isclothing(head))
+ var/obj/item/clothing/H = head
+ if(H.clothing_flags & SCAN_REAGENTS)
+ return TRUE
+ if(isclothing(wear_mask) && (wear_mask.clothing_flags & SCAN_REAGENTS))
+ return TRUE
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 06575aa802..ba40ae8e5f 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -48,41 +48,42 @@
if(affecting && affecting.dismemberable && affecting.get_damage() >= (affecting.max_damage - P.dismemberment))
affecting.dismember(P.damtype)
-/mob/living/carbon/proc/can_catch_item(skip_throw_mode_check)
- . = FALSE
- if(mind)
- if(mind.martial_art && mind.martial_art.dodge_chance == 100)
- return TRUE
- if(!skip_throw_mode_check && !in_throw_mode)
+/mob/living/carbon/catch_item(obj/item/I, skip_throw_mode_check = FALSE)
+ . = ..()
+ if(!HAS_TRAIT(src, TRAIT_AUTO_CATCH_ITEM) && !skip_throw_mode_check && !in_throw_mode)
return
- if(get_active_held_item())
+ if(get_active_held_item() || restrained())
return
- if(restrained())
- return
- return TRUE
-
-/mob/living/carbon/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked = FALSE)
- if(!skipcatch) //ugly, but easy
- if(can_catch_item())
- if(istype(AM, /obj/item))
- var/obj/item/I = AM
- if (mind)
- if (mind.martial_art && mind.martial_art.dodge_chance == 100) //autocatch for rising bass
- if (get_active_held_item())
- visible_message("[I] falls to the ground as [src] chops it out of the air!")
- return 1
- if(!in_throw_mode)
- throw_mode_on()
- if(isturf(I.loc))
- I.attack_hand(src)
- if(get_active_held_item() == I) //if our attack_hand() picks up the item...
- visible_message("[src] catches [I]!") //catch that sucker!
- throw_mode_off()
- return 1
- ..()
+ I.attack_hand(src)
+ if(get_active_held_item() == I) //if our attack_hand() picks up the item...
+ visible_message("[src] catches [I]!") //catch that sucker!
+ throw_mode_off()
+ return TRUE
+/mob/living/carbon/embed_item(obj/item/I)
+ throw_alert("embeddedobject", /obj/screen/alert/embeddedobject)
+ var/obj/item/bodypart/L = pick(bodyparts)
+ L.embedded_objects |= I
+ I.add_mob_blood(src)//it embedded itself in you, of course it's bloody!
+ I.forceMove(src)
+ L.receive_damage(I.w_class*I.embedding.embedded_impact_pain_multiplier)
+ visible_message("[I] embeds itself in [src]'s [L.name]!","[I] embeds itself in your [L.name]!")
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded)
/mob/living/carbon/attacked_by(obj/item/I, mob/living/user)
+ //CIT CHANGES START HERE - combatmode and resting checks
+ var/totitemdamage = I.force
+ if(iscarbon(user))
+ var/mob/living/carbon/tempcarb = user
+ if(!tempcarb.combatmode)
+ totitemdamage *= 0.5
+ if(user.resting)
+ totitemdamage *= 0.5
+ if(!combatmode)
+ totitemdamage *= 1.5
+ //CIT CHANGES END HERE
+ if(user != src && check_shields(I, totitemdamage, "the [I.name]", MELEE_ATTACK, I.armour_penetration))
+ return FALSE
var/obj/item/bodypart/affecting
if(user == src)
affecting = get_bodypart(check_zone(user.zone_selected)) //we're self-mutilating! yay!
@@ -93,17 +94,6 @@
SEND_SIGNAL(I, COMSIG_ITEM_ATTACK_ZONE, src, user, affecting)
send_item_attack_message(I, user, affecting.name)
if(I.force)
- //CIT CHANGES START HERE - combatmode and resting checks
- var/totitemdamage = I.force
- if(iscarbon(user))
- var/mob/living/carbon/tempcarb = user
- if(!tempcarb.combatmode)
- totitemdamage *= 0.5
- if(user.resting)
- totitemdamage *= 0.5
- if(!combatmode)
- totitemdamage *= 1.5
- //CIT CHANGES END HERE
apply_damage(totitemdamage, I.damtype, affecting) //CIT CHANGE - replaces I.force with totitemdamage
if(I.damtype == BRUTE && affecting.status == BODYPART_ORGANIC)
var/basebloodychance = affecting.brute_dam + totitemdamage
@@ -137,7 +127,9 @@
//ATTACK HAND IGNORING PARENT RETURN VALUE
/mob/living/carbon/attack_hand(mob/living/carbon/human/user)
-
+ . = ..()
+ if(.) //was the attack blocked?
+ return
for(var/thing in diseases)
var/datum/disease/D = thing
if(D.spread_flags & DISEASE_SPREAD_CONTACT_SKIN)
@@ -152,8 +144,7 @@
if(user.a_intent == INTENT_HELP || user.a_intent == INTENT_DISARM)
for(var/datum/surgery/S in surgeries)
if(S.next_step(user, user.a_intent))
- return 1
- return 0
+ return TRUE
/mob/living/carbon/attack_paw(mob/living/carbon/monkey/M)
@@ -173,7 +164,8 @@
help_shake_act(M)
return 0
- if(..()) //successful monkey bite.
+ . = ..()
+ if(.) //successful monkey bite.
for(var/thing in M.diseases)
var/datum/disease/D = thing
ForceContractDisease(D)
@@ -181,26 +173,27 @@
/mob/living/carbon/attack_slime(mob/living/simple_animal/slime/M)
- if(..()) //successful slime attack
- if(M.powerlevel > 0)
- var/stunprob = M.powerlevel * 7 + 10 // 17 at level 1, 80 at level 10
- if(prob(stunprob))
- M.powerlevel -= 3
- if(M.powerlevel < 0)
- M.powerlevel = 0
+ . = ..()
+ if(!.)
+ return
+ if(M.powerlevel > 0)
+ var/stunprob = M.powerlevel * 7 + 10 // 17 at level 1, 80 at level 10
+ if(prob(stunprob))
+ M.powerlevel -= 3
+ if(M.powerlevel < 0)
+ M.powerlevel = 0
- visible_message("The [M.name] has shocked [src]!", \
- "The [M.name] has shocked [src]!")
+ visible_message("The [M.name] has shocked [src]!", \
+ "The [M.name] has shocked [src]!")
- do_sparks(5, TRUE, src)
- var/power = M.powerlevel + rand(0,3)
- Knockdown(power*20)
- if(stuttering < power)
- stuttering = power
- if (prob(stunprob) && M.powerlevel >= 8)
- adjustFireLoss(M.powerlevel * rand(6,10))
- updatehealth()
- return 1
+ do_sparks(5, TRUE, src)
+ var/power = M.powerlevel + rand(0,3)
+ Knockdown(power*20)
+ if(stuttering < power)
+ stuttering = power
+ if (prob(stunprob) && M.powerlevel >= 8)
+ adjustFireLoss(M.powerlevel * rand(6,10))
+ updatehealth()
/mob/living/carbon/proc/dismembering_strike(mob/living/attacker, dam_zone)
if(!attacker.limb_destroyer)
@@ -332,12 +325,12 @@
else
return
-
+
else if(check_zone(M.zone_selected) == "r_arm" || check_zone(M.zone_selected) == "l_arm")
M.visible_message( \
"[M] shakes [src]'s hand.", \
"You shake [src]'s hand.", )
-
+
else
M.visible_message("[M] hugs [src] to make [p_them()] feel better!", \
"You hug [src] to make [p_them()] feel better!")
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index a1184613fe..9629dc3484 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -40,7 +40,7 @@
var/gib_type = /obj/effect/decal/cleanable/blood/gibs
- var/rotate_on_lying = 1
+ rotate_on_lying = TRUE
var/tinttotal = 0 // Total level of visualy impairing items
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index 345279df29..559c2ebcdd 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -22,6 +22,7 @@
muzzle_ignore = TRUE
restraint_check = TRUE
emote_type = EMOTE_AUDIBLE
+ mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
/datum/emote/living/carbon/clap/run_emote(mob/living/user, params)
. = ..()
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 310ab6beeb..3a6f0e6724 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -308,7 +308,7 @@
var/obj/item/organ/vocal_cords/Vc = user.getorganslot(ORGAN_SLOT_VOICE)
if(Vc)
if(istype(Vc, /obj/item/organ/vocal_cords/velvet))
- if(client?.prefs.lewdchem)
+ if(client.prefs.cit_toggles & HYPNO)
msg += "You feel your chords resonate looking at them.\n"
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 93f33c3a3d..9cbb5b1a0a 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -67,66 +67,36 @@
P.setAngle(rand(0, 360))//SHING
return FALSE
- if(!(P.original == src && P.firer == src)) //can't block or reflect when shooting yourself
- if(P.is_reflectable)
- if(check_reflect(def_zone)) // Checks if you've passed a reflection% check
- visible_message("The [P.name] gets reflected by [src]!", \
- "The [P.name] gets reflected by [src]!")
- // Find a turf near or on the original location to bounce to
- if(P.starting)
- var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
- var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
- var/turf/curloc = get_turf(src)
+ return ..()
- // redirect the projectile
- P.original = locate(new_x, new_y, P.z)
- P.starting = curloc
- P.firer = src
- P.yo = new_y - curloc.y
- P.xo = new_x - curloc.x
- var/new_angle_s = P.Angle + rand(120,240)
- while(new_angle_s > 180) // Translate to regular projectile degrees
- new_angle_s -= 360
- P.setAngle(new_angle_s)
+/mob/living/carbon/human/check_reflect(def_zone)
+ if(wear_suit?.IsReflect(def_zone))
+ return TRUE
+ return ..()
- return -1 // complete projectile permutation
-
- if(check_shields(P, P.damage, "the [P.name]", PROJECTILE_ATTACK, P.armour_penetration))
- P.on_hit(src, 100, def_zone)
- return 2
-
- return (..(P , def_zone))
-
-/mob/living/carbon/human/proc/check_reflect(def_zone) //Reflection checks for anything in your l_hand, r_hand, or wear_suit based on the reflection chance of the object
- if(wear_suit)
- if(wear_suit.IsReflect(def_zone) == 1)
- return 1
- for(var/obj/item/I in held_items)
- if(I.IsReflect(def_zone) == 1)
- return 1
- return 0
-
-/mob/living/carbon/human/proc/check_shields(atom/AM, var/damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0)
+/mob/living/carbon/human/check_shields(atom/AM, damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0)
+ . = ..()
+ if(.)
+ return
var/block_chance_modifier = round(damage / -3)
-
- for(var/obj/item/I in held_items)
- if(!istype(I, /obj/item/clothing))
- var/final_block_chance = I.block_chance - (CLAMP((armour_penetration-I.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
- if(I.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
- return 1
if(wear_suit)
var/final_block_chance = wear_suit.block_chance - (CLAMP((armour_penetration-wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier
if(wear_suit.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
- return 1
+ return TRUE
if(w_uniform)
var/final_block_chance = w_uniform.block_chance - (CLAMP((armour_penetration-w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier
if(w_uniform.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
- return 1
+ return TRUE
if(wear_neck)
var/final_block_chance = wear_neck.block_chance - (CLAMP((armour_penetration-wear_neck.armour_penetration)/2,0,100)) + block_chance_modifier
if(wear_neck.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
- return 1
- return 0
+ return TRUE
+ return FALSE
+
+/mob/living/carbon/human/can_embed(obj/item/I)
+ if(I.get_sharpness() || is_pointed(I) || is_type_in_typecache(I, GLOB.can_embed_types))
+ return TRUE
+ return FALSE
/mob/living/carbon/human/proc/check_block()
if(mind)
@@ -135,39 +105,7 @@
return FALSE
/mob/living/carbon/human/hitby(atom/movable/AM, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE)
- if(dna && dna.species)
- var/spec_return = dna.species.spec_hitby(AM, src)
- if(spec_return)
- return spec_return
- var/obj/item/I
- var/throwpower = 30
- if(istype(AM, /obj/item))
- I = AM
- throwpower = I.throwforce
- if(I.thrownby == src) //No throwing stuff at yourself to trigger hit reactions
- return ..()
- if(check_shields(AM, throwpower, "\the [AM.name]", THROWN_PROJECTILE_ATTACK))
- hitpush = FALSE
- skipcatch = TRUE
- blocked = TRUE
- else if(I)
- if(I.throw_speed >= EMBED_THROWSPEED_THRESHOLD && !(mind.martial_art && mind.martial_art.dodge_chance == 100))
- if(can_embed(I))
- if(prob(I.embedding.embed_chance) && !HAS_TRAIT(src, TRAIT_PIERCEIMMUNE))
- throw_alert("embeddedobject", /obj/screen/alert/embeddedobject)
- var/obj/item/bodypart/L = pick(bodyparts)
- L.embedded_objects |= I
- I.add_mob_blood(src)//it embedded itself in you, of course it's bloody!
- I.forceMove(src)
- L.receive_damage(I.w_class*I.embedding.embedded_impact_pain_multiplier)
- visible_message("[I] embeds itself in [src]'s [L.name]!","[I] embeds itself in your [L.name]!")
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded)
- hitpush = FALSE
- skipcatch = TRUE //can't catch the now embedded item
- if (mind)
- if (mind.martial_art && mind.martial_art.dodge_chance == 100)
- skipcatch = FALSE
- return ..()
+ return dna?.species?.spec_hitby(AM, src) || ..()
/mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)
if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && (HAS_TRAIT(src, TRAIT_FAT)) && ismonkey(pulling))
@@ -201,12 +139,12 @@
return dna.species.spec_attacked_by(I, user, affecting, a_intent, src)
-/mob/living/carbon/human/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+/mob/living/carbon/human/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
if(user.a_intent == INTENT_HARM)
- var/hulk_verb = pick("smash","pummel")
- if(check_shields(user, 15, "the [hulk_verb]ing"))
+ . = ..(user, TRUE)
+ if(.)
return
- ..(user, 1)
+ var/hulk_verb = pick("smash","pummel")
playsound(loc, user.dna.species.attack_sound, 25, 1, -1)
var/message = "[user] has [hulk_verb]ed [src]!"
visible_message("[message]", \
@@ -215,7 +153,8 @@
return 1
/mob/living/carbon/human/attack_hand(mob/user)
- if(..()) //to allow surgery to return properly.
+ . = ..()
+ if(.) //To allow surgery to return properly.
return
if(ishuman(user))
var/mob/living/carbon/human/H = user
@@ -227,8 +166,7 @@
if(!affecting)
affecting = get_bodypart(BODY_ZONE_CHEST)
if(M.a_intent == INTENT_HELP)
- ..() //shaking
- return 0
+ return ..() //shaking
if(M.a_intent == INTENT_DISARM) //Always drop item in hand, if no item, get stunned instead.
var/obj/item/I = get_active_held_item()
@@ -249,78 +187,69 @@
if(can_inject(M, 1, affecting))//Thick suits can stop monkey bites.
if(..()) //successful monkey bite, this handles disease contraction.
var/damage = rand(1, 3)
- if(check_shields(M, damage, "the [M.name]"))
- return 0
- if(stat != DEAD)
- apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee"))
+ apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee"))
return 1
/mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M)
- if(check_shields(M, 0, "the M.name"))
- visible_message("[M] attempted to touch [src]!")
- return 0
+ . = ..()
+ if(!.)
+ return
+ if(M.a_intent == INTENT_HARM)
+ if (w_uniform)
+ w_uniform.add_fingerprint(M)
+ var/damage = prob(90) ? 20 : 0
+ if(!damage)
+ playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
+ visible_message("[M] has lunged at [src]!", \
+ "[M] has lunged at [src]!")
+ return 0
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+ if(!affecting)
+ affecting = get_bodypart(BODY_ZONE_CHEST)
+ var/armor_block = run_armor_check(affecting, "melee", null, null,10)
- if(..())
- if(M.a_intent == INTENT_HARM)
- if (w_uniform)
- w_uniform.add_fingerprint(M)
- var/damage = prob(90) ? 20 : 0
- if(!damage)
- playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
- visible_message("[M] has lunged at [src]!", \
- "[M] has lunged at [src]!")
- return 0
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- var/armor_block = run_armor_check(affecting, "melee", null, null,10)
+ playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+ visible_message("[M] has slashed at [src]!", \
+ "[M] has slashed at [src]!")
+ log_combat(M, src, "attacked")
+ if(!dismembering_strike(M, M.zone_selected)) //Dismemberment successful
+ return 1
+ apply_damage(damage, BRUTE, affecting, armor_block)
- playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
- visible_message("[M] has slashed at [src]!", \
- "[M] has slashed at [src]!")
- log_combat(M, src, "attacked")
- if(!dismembering_strike(M, M.zone_selected)) //Dismemberment successful
- return 1
- apply_damage(damage, BRUTE, affecting, armor_block)
-
- if(M.a_intent == INTENT_DISARM) //Always drop item in hand, if no item, get stun instead.
- var/obj/item/I = get_active_held_item()
- if(I && dropItemToGround(I))
- playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
- visible_message("[M] disarmed [src]!", \
- "[M] disarmed [src]!")
+ if(M.a_intent == INTENT_DISARM) //Always drop item in hand, if no item, get stun instead.
+ var/obj/item/I = get_active_held_item()
+ if(I && dropItemToGround(I))
+ playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
+ visible_message("[M] disarmed [src]!", \
+ "[M] disarmed [src]!")
+ else
+ playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
+ if(!lying) //CITADEL EDIT
+ Knockdown(100, TRUE, FALSE, 30, 25)
else
- playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
- if(!lying) //CITADEL EDIT
- Knockdown(100, TRUE, FALSE, 30, 25)
- else
- Knockdown(100)
- log_combat(M, src, "tackled")
- visible_message("[M] has tackled down [src]!", \
- "[M] has tackled down [src]!")
-
+ Knockdown(100)
+ log_combat(M, src, "tackled")
+ visible_message("[M] has tackled down [src]!", \
+ "[M] has tackled down [src]!")
/mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L)
-
- if(..()) //successful larva bite.
- var/damage = rand(1, 3)
- if(check_shields(L, damage, "the [L.name]"))
- return 0
- if(stat != DEAD)
- L.amount_grown = min(L.amount_grown + damage, L.max_grown)
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(L.zone_selected))
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- var/armor_block = run_armor_check(affecting, "melee")
- apply_damage(damage, BRUTE, affecting, armor_block)
+ . = ..()
+ if(!.) //unsuccessful larva bite.
+ return
+ var/damage = rand(1, 3)
+ if(stat != DEAD)
+ L.amount_grown = min(L.amount_grown + damage, L.max_grown)
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(L.zone_selected))
+ if(!affecting)
+ affecting = get_bodypart(BODY_ZONE_CHEST)
+ var/armor_block = run_armor_check(affecting, "melee")
+ apply_damage(damage, BRUTE, affecting, armor_block)
/mob/living/carbon/human/attack_animal(mob/living/simple_animal/M)
. = ..()
if(.)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
- if(check_shields(M, damage, "the [M.name]", MELEE_ATTACK, M.armour_penetration))
- return FALSE
var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
if(!dam_zone) //Dismemberment successful
return TRUE
@@ -332,23 +261,22 @@
/mob/living/carbon/human/attack_slime(mob/living/simple_animal/slime/M)
- if(..()) //successful slime attack
- var/damage = rand(5, 25)
- if(M.is_adult)
- damage = rand(10, 35)
+ . = ..()
+ if(!.) //unsuccessful slime attack
+ return
+ var/damage = rand(5, 25)
+ if(M.is_adult)
+ damage = rand(10, 35)
- if(check_shields(M, damage, "the [M.name]"))
- return 0
+ var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
+ if(!dam_zone) //Dismemberment successful
+ return 1
- var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
- if(!dam_zone) //Dismemberment successful
- return 1
-
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- var/armor_block = run_armor_check(affecting, "melee")
- apply_damage(damage, BRUTE, affecting, armor_block)
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
+ if(!affecting)
+ affecting = get_bodypart(BODY_ZONE_CHEST)
+ var/armor_block = run_armor_check(affecting, "melee")
+ apply_damage(damage, BRUTE, affecting, armor_block)
/mob/living/carbon/human/mech_melee_attack(obj/mecha/M)
if(M.occupant.a_intent == INTENT_HARM)
@@ -405,7 +333,7 @@
switch (severity)
if (1)
if(bomb_armor)
- b_loss = 500*bomb_armor
+ b_loss = (350*bomb_armor)+150
var/atom/throw_target = get_edge_target_turf(src, get_dir(src, get_step_away(src, src)))
throw_at(throw_target, 200, 4)
damage_clothes(400*bomb_armor, BRUTE, "bomb")
@@ -652,7 +580,7 @@
if(mind)
if((mind.assigned_role == "Station Engineer") || (mind.assigned_role == "Chief Engineer") )
gain = 100
- if(mind.assigned_role == "Clown")
+ if(HAS_TRAIT(mind, TRAIT_CLOWN_MENTALITY))
gain = rand(-300, 300)
investigate_log("([key_name(src)]) has been consumed by the singularity.", INVESTIGATE_SINGULO) //Oh that's where the clown ended up!
gib()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 8bf6b4ad3a..2e069297b3 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -545,6 +545,20 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
//Underwear, Undershirts & Socks
if(!(NO_UNDERWEAR in species_traits))
+
+ if(H.socks && H.get_num_legs(FALSE) >= 2)
+ if(H.hidden_socks)
+ H.socks = "Nude"
+ else
+ H.socks = H.saved_socks
+ var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[H.socks]
+ if(S)
+ var/digilegs = ((DIGITIGRADE in species_traits) && S.has_digitigrade) ? "_d" : ""
+ var/mutable_appearance/MA = mutable_appearance(S.icon, "[S.icon_state][digilegs]", -BODY_LAYER)
+ if(S.has_color)
+ MA.color = "#[H.socks_color]"
+ standing += MA
+
if(H.underwear)
if(H.hidden_underwear)
H.underwear = "Nude"
@@ -552,8 +566,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
H.underwear = H.saved_underwear
var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[H.underwear]
if(B)
- var/mutable_appearance/MA = mutable_appearance(B.icon, B.icon_state, -BODY_LAYER)
- if(UNDIE_COLORABLE(B))
+ var/digilegs = ((DIGITIGRADE in species_traits) && B.has_digitigrade) ? "_d" : ""
+ var/mutable_appearance/MA = mutable_appearance(B.icon, "[B.icon_state][digilegs]", -BODY_LAYER)
+ if(B.has_color)
MA.color = "#[H.undie_color]"
standing += MA
@@ -564,28 +579,16 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
H.undershirt = H.saved_undershirt
var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[H.undershirt]
if(T)
+ var/state = "[T.icon_state][((DIGITIGRADE in species_traits) && T.has_digitigrade) ? "_d" : ""]"
var/mutable_appearance/MA
if(H.dna.species.sexes && H.gender == FEMALE)
- MA = wear_female_version(T.icon_state, T.icon, BODY_LAYER)
+ MA = wear_female_version(state, T.icon, BODY_LAYER)
else
- MA = mutable_appearance(T.icon, T.icon_state, -BODY_LAYER)
- if(UNDIE_COLORABLE(T))
+ MA = mutable_appearance(T.icon, state, -BODY_LAYER)
+ if(T.has_color)
MA.color = "#[H.shirt_color]"
standing += MA
- if(H.socks && H.get_num_legs(FALSE) >= 2)
- if(H.hidden_socks)
- H.socks = "Nude"
- else
- H.socks = H.saved_socks
- var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[H.socks]
- if(S)
- var/digilegs = (DIGITIGRADE in species_traits) ? "_d" : ""
- var/mutable_appearance/MA = mutable_appearance(S.icon, "[S.icon_state][digilegs]", -BODY_LAYER)
- if(UNDIE_COLORABLE(S))
- MA.color = "#[H.socks_color]"
- standing += MA
-
if(standing.len)
H.overlays_standing[BODY_LAYER] = standing
@@ -1589,20 +1592,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
user.adjustStaminaLossBuffered(3)
return FALSE
else if(aim_for_groin && (target == user || target.lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin))
+ if(target.client?.prefs.cit_toggles & NO_ASS_SLAP)
+ to_chat(user,"A force stays your hand, preventing you from slapping \the [target]'s ass!")
+ return FALSE
user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP)
user.adjustStaminaLossBuffered(3)
- if(HAS_TRAIT(target, TRAIT_ASSBLASTUSA))
- var/hit_zone = (user.held_index_to_dir(user.active_hand_index) == "l" ? "l_":"r_") + "arm"
- user.adjustStaminaLoss(20, affected_zone = hit_zone)
- user.visible_message(\
- "\The [user] slaps \the [target]'s ass, but their hand bounces off like they hit metal!",\
- "You slap [user == target ? "your" : "\the [target]'s"] ass, but feel an intense amount of pain as you realise their buns are harder than steel!",\
- "You hear a slap."
- )
- playsound(target.loc, 'sound/weapons/tap.ogg', 50, 1, -1)
- user.emote("scream")
- return FALSE
-
playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
user.visible_message(\
"\The [user] slaps \the [target]'s ass!",\
@@ -1691,11 +1685,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
attacker_style = M.mind.martial_art
if(attacker_style?.pacifism_check && HAS_TRAIT(M, TRAIT_PACIFISM)) // most martial arts are quite harmful, alas.
attacker_style = null
- if((M != H) && M.a_intent != INTENT_HELP && H.check_shields(M, 0, M.name, attack_type = UNARMED_ATTACK))
- log_combat(M, H, "attempted to touch")
- H.visible_message("[M] attempted to touch [H]!")
- return 0
- SEND_SIGNAL(M, COMSIG_MOB_ATTACK_HAND, M, H, attacker_style)
switch(M.a_intent)
if("help")
help(M, H, attacker_style)
diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
index ceadb28115..7744a65464 100644
--- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
@@ -37,11 +37,16 @@
H.dna.features["caps"] = "Round"
handle_mutant_bodyparts(H)
H.faction |= "mushroom"
- mush = new(null)
- mush.teach(H)
+ mush = new()
+ mush.teach(H, TRUE)
+ RegisterSignal(C, COMSIG_MOB_ON_NEW_MIND, .proc/on_new_mind)
+
+/datum/species/mush/proc/on_new_mind(mob/owner)
+ mush.teach(owner, TRUE) //make_temporary TRUE as it shouldn't carry over to other mobs on mind transfer_to.
/datum/species/mush/on_species_loss(mob/living/carbon/C)
. = ..()
+ UnregisterSignal(C, COMSIG_MOB_ON_NEW_MIND)
C.faction -= "mushroom"
mush.remove(C)
QDEL_NULL(mush)
diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index 3247c96632..52ae32b23c 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -51,11 +51,7 @@
. = ..()
to_chat(C, "[info_text]")
- C.real_name = "[pick(GLOB.nightmare_names)]"
- C.name = C.real_name
- if(C.mind)
- C.mind.name = C.real_name
- C.dna.real_name = C.real_name
+ C.fully_replace_character_name("[pick(GLOB.nightmare_names)]")
/datum/species/shadow/nightmare/bullet_act(obj/item/projectile/P, mob/living/carbon/human/H)
var/turf/T = H.loc
@@ -127,8 +123,8 @@
/obj/item/organ/heart/nightmare/Remove(mob/living/carbon/M, special = 0)
respawn_progress = 0
if(blade && special != HEART_SPECIAL_SHADOWIFY)
- QDEL_NULL(blade)
M.visible_message("\The [blade] disintegrates!")
+ QDEL_NULL(blade)
..()
/obj/item/organ/heart/nightmare/Stop()
@@ -183,15 +179,21 @@
. = ..()
if(!proximity)
return
- if(isopenturf(AM)) //So you can actually melee with it
- return
- if(isliving(AM))
+ if(isopenturf(AM))
+ var/turf/open/T = AM
+ if(T.light_range && !isspaceturf(T)) //no fairy grass or light tile can escape the fury of the darkness.
+ to_chat(user, "You scrape away [T] with your [name] and snuff out its lights.")
+ T.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
+ else if(isliving(AM))
var/mob/living/L = AM
if(iscyborg(AM))
var/mob/living/silicon/robot/borg = AM
- if(!borg.lamp_cooldown)
+ if(borg.lamp_intensity)
borg.update_headlamp(TRUE, INFINITY)
to_chat(borg, "Your headlamp is fried! You'll need a human to help replace it.")
+ for(var/obj/item/assembly/flash/cyborg/F in borg.held_items)
+ if(!F.crit_fail)
+ F.burn_out()
else
for(var/obj/item/O in AM)
if(O.light_range && O.light_power)
diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm
index 92ad87f6b5..56ef4fe24a 100644
--- a/code/modules/mob/living/carbon/monkey/combat.dm
+++ b/code/modules/mob/living/carbon/monkey/combat.dm
@@ -369,6 +369,23 @@
retaliate(L)
return ..()
+/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M)
+ if(M.a_intent == INTENT_HARM && prob(MONKEY_RETALIATE_HARM_PROB))
+ retaliate(M)
+ else if(M.a_intent == INTENT_DISARM && prob(MONKEY_RETALIATE_DISARM_PROB))
+ retaliate(M)
+ return ..()
+
+/mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L)
+ if(L.a_intent == INTENT_HARM && prob(MONKEY_RETALIATE_HARM_PROB))
+ retaliate(L)
+ return ..()
+
+/mob/living/carbon/monkey/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ if(user.a_intent == INTENT_HARM && prob(MONKEY_RETALIATE_HARM_PROB))
+ retaliate(user)
+ return ..()
+
/mob/living/carbon/monkey/attack_paw(mob/living/L)
if(L.a_intent == INTENT_HARM && prob(MONKEY_RETALIATE_HARM_PROB))
retaliate(L)
diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
index df90dd56fd..32e3d21ee2 100644
--- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm
@@ -6,37 +6,55 @@
..()
/mob/living/carbon/monkey/attack_paw(mob/living/M)
- if(..()) //successful monkey bite.
- var/dam_zone = pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- if(M.limb_destroyer)
- dismembering_strike(M, affecting.body_zone)
- if(stat != DEAD)
- var/dmg = rand(1, 5)
- apply_damage(dmg, BRUTE, affecting)
+ . = ..()
+ if(!.) //unsuccessful monkey bite.
+ return
+ var/dam_zone = pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
+ if(!affecting)
+ affecting = get_bodypart(BODY_ZONE_CHEST)
+ if(M.limb_destroyer)
+ dismembering_strike(M, affecting.body_zone)
+ var/dmg = rand(1, 5)
+ apply_damage(dmg, BRUTE, affecting)
/mob/living/carbon/monkey/attack_larva(mob/living/carbon/alien/larva/L)
- if(..()) //successful larva bite.
- var/damage = rand(1, 3)
- if(stat != DEAD)
- L.amount_grown = min(L.amount_grown + damage, L.max_grown)
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(L.zone_selected))
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- apply_damage(damage, BRUTE, affecting)
+ . = ..()
+ if(!.) //unsuccessful larva bite
+ return
+ var/damage = rand(1, 3)
+ if(stat != DEAD)
+ L.amount_grown = min(L.amount_grown + damage, L.max_grown)
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(L.zone_selected))
+ if(!affecting)
+ affecting = get_bodypart(BODY_ZONE_CHEST)
+ apply_damage(damage, BRUTE, affecting)
+
+/mob/living/carbon/monkey/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ . = ..(user, TRUE)
+ if(.)
+ return
+ var/hulk_verb = pick("smash","pummel")
+ playsound(loc, user.dna.species.attack_sound, 25, 1, -1)
+ var/message = "[user] has [hulk_verb]ed [src]!"
+ visible_message("[message]", \
+ "[message]")
+ adjustBruteLoss(15)
+ return TRUE
/mob/living/carbon/monkey/attack_hand(mob/living/carbon/human/M)
- if(..()) //To allow surgery to return properly.
+ . = ..()
+ if(.) //To allow surgery to return properly.
return
-
switch(M.a_intent)
- if("help")
+ if(INTENT_HELP)
help_shake_act(M)
- if("grab")
+ if(INTENT_GRAB)
grabbedby(M)
- if("harm")
+ if(INTENT_HARM)
+ if(HAS_TRAIT(M, TRAIT_PACIFISM))
+ to_chat(M, "You don't want to hurt [src]!")
+ return
M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
if (prob(75))
visible_message("[M] has punched [name]!", \
@@ -60,7 +78,7 @@
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
visible_message("[M] has attempted to punch [name]!", \
"[M] has attempted to punch [name]!", null, COMBAT_MESSAGE_RANGE)
- if("disarm")
+ if(INTENT_DISARM)
if(!IsUnconscious())
M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
if (prob(25))
@@ -74,50 +92,51 @@
visible_message("[M] has disarmed [src]!", "[M] has disarmed [src]!", null, COMBAT_MESSAGE_RANGE)
/mob/living/carbon/monkey/attack_alien(mob/living/carbon/alien/humanoid/M)
- if(..()) //if harm or disarm intent.
- if (M.a_intent == INTENT_HARM)
- if ((prob(95) && health > 0))
- playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
- var/damage = rand(15, 30)
- if (damage >= 25)
- damage = rand(20, 40)
- if(AmountUnconscious() < 300)
- Unconscious(rand(200, 300))
- visible_message("[M] has wounded [name]!", \
- "[M] has wounded [name]!", null, COMBAT_MESSAGE_RANGE)
- else
- visible_message("[M] has slashed [name]!", \
- "[M] has slashed [name]!", null, COMBAT_MESSAGE_RANGE)
-
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
- log_combat(M, src, "attacked")
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- if(!dismembering_strike(M, affecting.body_zone)) //Dismemberment successful
- return 1
- apply_damage(damage, BRUTE, affecting)
-
+ . = ..()
+ if(!.) // the attack was blocked or was help/grab intent
+ return
+ if (M.a_intent == INTENT_HARM)
+ if ((prob(95) && health > 0))
+ playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+ var/damage = rand(15, 30)
+ if (damage >= 25)
+ damage = rand(20, 40)
+ if(AmountUnconscious() < 300)
+ Unconscious(rand(200, 300))
+ visible_message("[M] has wounded [name]!", \
+ "[M] has wounded [name]!", null, COMBAT_MESSAGE_RANGE)
else
- playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
- visible_message("[M] has attempted to lunge at [name]!", \
- "[M] has attempted to lunge at [name]!", null, COMBAT_MESSAGE_RANGE)
+ visible_message("[M] has slashed [name]!", \
+ "[M] has slashed [name]!", null, COMBAT_MESSAGE_RANGE)
- if (M.a_intent == INTENT_DISARM)
- var/obj/item/I = null
- playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
- if(prob(95))
- Knockdown(20)
- visible_message("[M] has tackled down [name]!", \
- "[M] has tackled down [name]!", null, COMBAT_MESSAGE_RANGE)
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+ log_combat(M, src, "attacked")
+ if(!affecting)
+ affecting = get_bodypart(BODY_ZONE_CHEST)
+ if(!dismembering_strike(M, affecting.body_zone)) //Dismemberment successful
+ return 1
+ apply_damage(damage, BRUTE, affecting)
+
+ else
+ playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
+ visible_message("[M] has attempted to lunge at [name]!", \
+ "[M] has attempted to lunge at [name]!", null, COMBAT_MESSAGE_RANGE)
+
+ else
+ var/obj/item/I = null
+ playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
+ if(prob(95))
+ Knockdown(20)
+ visible_message("[M] has tackled down [name]!", \
+ "[M] has tackled down [name]!", null, COMBAT_MESSAGE_RANGE)
+ else
+ I = get_active_held_item()
+ if(dropItemToGround(I))
+ visible_message("[M] has disarmed [name]!", "[M] has disarmed [name]!", null, COMBAT_MESSAGE_RANGE)
else
- I = get_active_held_item()
- if(dropItemToGround(I))
- visible_message("[M] has disarmed [name]!", "[M] has disarmed [name]!", null, COMBAT_MESSAGE_RANGE)
- else
- I = null
- log_combat(M, src, "disarmed", "[I ? " removing \the [I]" : ""]")
- updatehealth()
-
+ I = null
+ log_combat(M, src, "disarmed", "[I ? " removing \the [I]" : ""]")
+ updatehealth()
/mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M)
. = ..()
@@ -132,17 +151,19 @@
apply_damage(damage, M.melee_damage_type, affecting)
/mob/living/carbon/monkey/attack_slime(mob/living/simple_animal/slime/M)
- if(..()) //successful slime attack
- var/damage = rand(5, 35)
- if(M.is_adult)
- damage = rand(20, 40)
- var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
- if(!dam_zone) //Dismemberment successful
- return 1
- var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
- if(!affecting)
- affecting = get_bodypart(BODY_ZONE_CHEST)
- apply_damage(damage, BRUTE, affecting)
+ . = ..()
+ if(!.) //unsuccessful slime attack
+ return
+ var/damage = rand(5, 35)
+ if(M.is_adult)
+ damage = rand(20, 40)
+ var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
+ if(!dam_zone) //Dismemberment successful
+ return 1
+ var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
+ if(!affecting)
+ affecting = get_bodypart(BODY_ZONE_CHEST)
+ apply_damage(damage, BRUTE, affecting)
/mob/living/carbon/monkey/acid_act(acidpwr, acid_volume, bodyzone_hit)
. = 1
diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index 66be8058f1..0155f2575d 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -1,31 +1,3 @@
-//IMPORTANT: Multiple animate() calls do not stack well, so try to do them all at once if you can.
-/mob/living/carbon/update_transform()
- var/matrix/ntransform = matrix(transform) //aka transform.Copy()
- var/final_pixel_y = pixel_y
- var/final_dir = dir
- var/changed = 0
- if(lying != lying_prev && rotate_on_lying)
- changed++
- ntransform.TurnTo(lying_prev,lying)
- if(lying == 0) //Lying to standing
- final_pixel_y = get_standard_pixel_y_offset()
- else //if(lying != 0)
- if(lying_prev == 0) //Standing to lying
- pixel_y = get_standard_pixel_y_offset()
- final_pixel_y = get_standard_pixel_y_offset(lying)
- if(dir & (EAST|WEST)) //Facing east or west
- final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass
-
- if(resize != RESIZE_DEFAULT_SIZE)
- changed++
- ntransform.Scale(resize)
- resize = RESIZE_DEFAULT_SIZE
-
- if(changed)
- animate(src, transform = ntransform, time = 2, pixel_y = final_pixel_y, dir = final_dir, easing = EASE_IN|EASE_OUT)
- setMovetype(movement_type & ~FLOATING) // If we were without gravity, the bouncing animation got stopped, so we make sure we restart it in next life().
-
-
/mob/living/carbon
var/list/overlays_standing[TOTAL_LAYERS]
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 8345ef916d..1c6546fd83 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -91,7 +91,9 @@
if(mind && mind.name && mind.active && !istype(T.loc, /area/ctf) && !(signal & COMPONENT_BLOCK_DEATH_BROADCAST))
var/rendered = "[mind.name] has died at [get_area_name(T)]."
deadchat_broadcast(rendered, follow_target = src, turf_target = T, message_type=DEADCHAT_DEATHRATTLE)
-
+ if (client && client.prefs && client.prefs.auto_ooc)
+ if (!(client.prefs.chat_toggles & CHAT_OOC))
+ client.prefs.chat_toggles ^= CHAT_OOC
if (client)
client.move_delay = initial(client.move_delay)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 722c984309..3c5c5e3518 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -36,7 +36,50 @@
/mob/living/proc/on_hit(obj/item/projectile/P)
return
+/mob/living/proc/check_shields(atom/AM, damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0)
+ var/block_chance_modifier = round(damage / -3)
+ for(var/obj/item/I in held_items)
+ if(!istype(I, /obj/item/clothing))
+ var/final_block_chance = I.block_chance - (CLAMP((armour_penetration-I.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
+ if(I.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
+ return TRUE
+ return FALSE
+
+/mob/living/proc/check_reflect(def_zone) //Reflection checks for anything in your hands, based on the reflection chance of the object(s)
+ for(var/obj/item/I in held_items)
+ if(I.IsReflect(def_zone))
+ return TRUE
+ return FALSE
+
+/mob/living/proc/reflect_bullet_check(obj/item/projectile/P, def_zone)
+ if(P.is_reflectable && check_reflect(def_zone)) // Checks if you've passed a reflection% check
+ visible_message("The [P.name] gets reflected by [src]!", \
+ "The [P.name] gets reflected by [src]!")
+ // Find a turf near or on the original location to bounce to
+ if(P.starting)
+ var/new_x = P.starting.x + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
+ var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
+ var/turf/curloc = get_turf(src)
+ // redirect the projectile
+ P.original = locate(new_x, new_y, P.z)
+ P.starting = curloc
+ P.firer = src
+ P.yo = new_y - curloc.y
+ P.xo = new_x - curloc.x
+ var/new_angle_s = P.Angle + rand(120,240)
+ while(new_angle_s > 180) // Translate to regular projectile degrees
+ new_angle_s -= 360
+ P.setAngle(new_angle_s)
+ return TRUE
+ return FALSE
+
/mob/living/bullet_act(obj/item/projectile/P, def_zone)
+ if(P.original != src || P.firer != src) //try to block or reflect the bullet, can't do so when shooting oneself
+ if(reflect_bullet_check(P, def_zone))
+ return -1 // complete projectile permutation
+ if(check_shields(P, P.damage, "the [P.name]", PROJECTILE_ATTACK, P.armour_penetration))
+ P.on_hit(src, 100, def_zone)
+ return 2
var/armor = run_armor_check(def_zone, P.flag, null, null, P.armour_penetration, null)
if(!P.nodamage)
apply_damage(P.damage, P.damage_type, def_zone, armor)
@@ -55,9 +98,32 @@
else
return 0
+/mob/living/proc/catch_item(obj/item/I, skip_throw_mode_check = FALSE)
+ return FALSE
+
+/mob/living/proc/embed_item(obj/item/I)
+ return
+
+/mob/living/proc/can_embed(obj/item/I)
+ return FALSE
+
/mob/living/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked = FALSE)
- if(istype(AM, /obj/item))
- var/obj/item/I = AM
+ var/obj/item/I
+ var/throwpower = 30
+ if(isitem(AM))
+ I = AM
+ throwpower = I.throwforce
+ if(check_shields(AM, throwpower, "\the [AM.name]", THROWN_PROJECTILE_ATTACK))
+ hitpush = FALSE
+ skipcatch = TRUE
+ blocked = TRUE
+ else if(I && I.throw_speed >= EMBED_THROWSPEED_THRESHOLD && can_embed(I, src) && prob(I.embedding.embed_chance) && !HAS_TRAIT(src, TRAIT_PIERCEIMMUNE) && (!HAS_TRAIT(src, TRAIT_AUTO_CATCH_ITEM) || incapacitated() || get_active_held_item()))
+ embed_item(I)
+ hitpush = FALSE
+ skipcatch = TRUE //can't catch the now embedded item
+ if(I)
+ if(!skipcatch && isturf(I.loc) && catch_item(I))
+ return TRUE
var/zone = ran_zone(BODY_ZONE_CHEST, 65)//Hits a random part of the body, geared towards the chest
var/dtype = BRUTE
var/volume = I.get_volume_by_throwforce_and_or_w_class()
@@ -214,6 +280,24 @@
Move(user.loc)
return 1
+/mob/living/attack_hand(mob/user)
+ ..() //Ignoring parent return value here.
+ SEND_SIGNAL(src, COMSIG_MOB_ATTACK_HAND, user)
+ if((user != src) && user.a_intent != INTENT_HELP && check_shields(user, 0, user.name, attack_type = UNARMED_ATTACK))
+ log_combat(user, src, "attempted to touch")
+ visible_message("[user] attempted to touch [src]!")
+ return TRUE
+
+/mob/living/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ if(user.a_intent == INTENT_HARM)
+ if(HAS_TRAIT(user, TRAIT_PACIFISM))
+ to_chat(user, "You don't want to hurt [src]!")
+ return TRUE
+ var/hulk_verb = pick("smash","pummel")
+ if(user != src && check_shields(user, 15, "the [hulk_verb]ing"))
+ return TRUE
+ ..()
+ return FALSE
/mob/living/attack_slime(mob/living/simple_animal/slime/M)
if(!SSticker.HasRoundStarted())
@@ -229,6 +313,12 @@
to_chat(M, "You don't want to hurt anyone!")
return FALSE
+ var/damage = rand(5, 35)
+ if(M.is_adult)
+ damage = rand(20, 40)
+ if(check_shields(M, damage, "the [M.name]"))
+ return FALSE
+
if (stat != DEAD)
log_combat(M, src, "attacked")
M.do_attack_animation(src)
@@ -245,7 +335,8 @@
if(HAS_TRAIT(M, TRAIT_PACIFISM))
to_chat(M, "You don't want to hurt anyone!")
return FALSE
-
+ if(check_shields(M, rand(M.melee_damage_lower, M.melee_damage_upper), "the [M.name]", MELEE_ATTACK, M.armour_penetration))
+ return FALSE
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
M.do_attack_animation(src)
@@ -256,10 +347,6 @@
/mob/living/attack_paw(mob/living/carbon/monkey/M)
- if(isturf(loc) && istype(loc.loc, /area/start))
- to_chat(M, "No attacking people at spawn, you jackass.")
- return FALSE
-
if (M.a_intent == INTENT_HARM)
if(HAS_TRAIT(M, TRAIT_PACIFISM))
to_chat(M, "You don't want to hurt anyone!")
@@ -268,6 +355,8 @@
if(M.is_muzzled() || (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSMOUTH))
to_chat(M, "You can't bite with your mouth covered!")
return FALSE
+ if(check_shields(M, 0, "the [M.name]"))
+ return FALSE
M.do_attack_animation(src, ATTACK_EFFECT_BITE)
if (prob(75))
log_combat(M, src, "attacked")
@@ -282,15 +371,16 @@
/mob/living/attack_larva(mob/living/carbon/alien/larva/L)
switch(L.a_intent)
- if("help")
+ if(INTENT_HELP)
visible_message("[L.name] rubs its head against [src].")
return FALSE
else
if(HAS_TRAIT(L, TRAIT_PACIFISM))
to_chat(L, "You don't want to hurt anyone!")
- return
-
+ return FALSE
+ if(L != src && check_shields(L, rand(1, 3), "the [L.name]"))
+ return FALSE
L.do_attack_animation(src)
if(prob(90))
log_combat(L, src, "attacked")
@@ -301,24 +391,29 @@
else
visible_message("[L.name] has attempted to bite [src]!", \
"[L.name] has attempted to bite [src]!", null, COMBAT_MESSAGE_RANGE)
- return FALSE
/mob/living/attack_alien(mob/living/carbon/alien/humanoid/M)
+ if((M != src) && M.a_intent != INTENT_HELP && check_shields(M, 0, "the [M.name]"))
+ visible_message("[M] attempted to touch [src]!")
+ return FALSE
switch(M.a_intent)
- if ("help")
- visible_message("[M] caresses [src] with its scythe like arm.")
+ if (INTENT_HELP)
+ if(!isalien(src)) //I know it's ugly, but the alien vs alien attack_alien behaviour is a bit different.
+ visible_message("[M] caresses [src] with its scythe like arm.")
return FALSE
- if ("grab")
+ if (INTENT_GRAB)
grabbedby(M)
return FALSE
- if("harm")
+ if(INTENT_HARM)
if(HAS_TRAIT(M, TRAIT_PACIFISM))
to_chat(M, "You don't want to hurt anyone!")
return FALSE
- M.do_attack_animation(src)
+ if(!isalien(src))
+ M.do_attack_animation(src)
return TRUE
- if("disarm")
- M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
+ if(INTENT_DISARM)
+ if(!isalien(src))
+ M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
return TRUE
/mob/living/ex_act(severity, target, origin)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 4d2a36907d..783e044492 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -111,4 +111,6 @@
var/list/diseases = list() // list of all diseases in a mob
var/list/disease_resistances = list()
- var/drag_slowdown = TRUE //Whether the mob is slowed down when dragging another prone mob
\ No newline at end of file
+ var/drag_slowdown = TRUE //Whether the mob is slowed down when dragging another prone mob
+
+ var/rotate_on_lying = FALSE
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 0444458841..1694d04b82 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -260,15 +260,6 @@
viewalerts = 1
src << browse(dat, "window=aialerts&can_close=0")
-/mob/living/silicon/ai/proc/ai_roster()
- var/dat = "Crew RosterCrew Roster:
"
-
- dat += GLOB.data_core.get_manifest()
- dat += ""
-
- src << browse(dat, "window=airoster")
- onclose(src, "airoster")
-
/mob/living/silicon/ai/proc/ai_call_shuttle()
if(control_disabled)
to_chat(usr, "Wireless control is disabled!")
@@ -681,18 +672,23 @@
"green face" = 'icons/mob/ai.dmi',
"xeno queen" = 'icons/mob/alien.dmi',
"horror" = 'icons/mob/ai.dmi',
- "creature" = 'icons/mob/ai.dmi'
+ "creature" = 'icons/mob/ai.dmi',
+ "custom"
)
input = input("Please select a hologram:") as null|anything in icon_list
if(input)
qdel(holo_icon)
switch(input)
- if("xeno queen")
+ if("custom")
+ if(client?.prefs?.custom_holoform_icon)
+ holo_icon = client.prefs.get_filtered_holoform(HOLOFORM_FILTER_AI)
+ else
+ holo_icon = getHologramIcon(icon('icons/mob/ai.dmi', "female"))
+ else if("xeno queen")
holo_icon = getHologramIcon(icon(icon_list[input],"alienq"))
else
holo_icon = getHologramIcon(icon(icon_list[input], input))
- return
/mob/living/silicon/ai/proc/corereturn()
set category = "Malfunction"
diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm
index 7c59c2b791..97d26f672a 100644
--- a/code/modules/mob/living/silicon/ai/ai_defense.dm
+++ b/code/modules/mob/living/silicon/ai/ai_defense.dm
@@ -1,15 +1,9 @@
-
/mob/living/silicon/ai/attacked_by(obj/item/I, mob/living/user, def_zone)
+ . = ..()
+ if(!.)
+ return FALSE
if(I.force && I.damtype != STAMINA && stat != DEAD) //only sparks if real damage is dealt.
spark_system.start()
- return ..()
-
-
-/mob/living/silicon/ai/attack_alien(mob/living/carbon/alien/humanoid/M)
- if(!SSticker.HasRoundStarted())
- to_chat(M, "You cannot attack people before the game has started.")
- return
- ..()
/mob/living/silicon/ai/attack_slime(mob/living/simple_animal/slime/user)
return //immune to slimes
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 7477ba7713..38afaf8313 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -68,7 +68,7 @@
// Use this when setting the aiEye's location.
// It will also stream the chunk that the new loc is in.
-/mob/camera/aiEye/proc/setLoc(T, force_update = FALSE)
+/mob/camera/aiEye/proc/setLoc(T, force_update = FALSE, dir)
if(ai)
if(!isturf(ai.loc))
return
@@ -88,7 +88,7 @@
//Holopad
if(istype(ai.current, /obj/machinery/holopad))
var/obj/machinery/holopad/H = ai.current
- H.move_hologram(ai, T)
+ H.move_hologram(ai, T, dir)
if(ai.camera_light_on)
ai.light_cameras()
if(ai.master_multicam)
@@ -139,7 +139,7 @@
for(var/i = 0; i < max(user.sprint, initial); i += 20)
var/turf/step = get_turf(get_step(user.eyeobj, direct))
if(step)
- user.eyeobj.setLoc(step)
+ user.eyeobj.setLoc(step, null, direct)
user.cooldown = world.timeofday + 5
if(user.acceleration)
diff --git a/code/modules/mob/living/silicon/custom_holoform.dm b/code/modules/mob/living/silicon/custom_holoform.dm
new file mode 100644
index 0000000000..8ce6e9a29a
--- /dev/null
+++ b/code/modules/mob/living/silicon/custom_holoform.dm
@@ -0,0 +1,28 @@
+/mob/living/silicon/verb/clear_custom_holoform()
+ set name = "Clear Custom Holoform"
+ set desc = "Clear your current custom holoform"
+ set category = "OOC"
+
+ if(!client.prefs)
+ to_chat(src, "No preferences datum on your client, contact an admin/coder!")
+ return
+ client.prefs.custom_holoform_icon = null
+ client.prefs.cached_holoform_icons = null
+ to_chat(src, "Holoform removed.")
+
+/mob/living/silicon/verb/set_custom_holoform()
+ set name = "Set Custom Holoform"
+ set desc = "Set your custom holoform using your current preferences slot and a specified set of gear."
+ set category = "OOC"
+
+ if(!client.prefs)
+ to_chat(src, "No preferences datum on your client, contact an admin/coder!")
+ return
+ if(client.prefs.last_custom_holoform > world.time - CUSTOM_HOLOFORM_DELAY)
+ to_chat(src, "You are attempting to change custom holoforms too fast!")
+ var/icon/new_holoform = user_interface_custom_holoform(client)
+ if(new_holoform)
+ client.prefs.custom_holoform_icon = new_holoform
+ client.prefs.cached_holoform_icons = null
+ client.prefs.last_custom_holoform = world.time
+ to_chat(src, "Holoform set.")
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 7ec63cf415..7055838039 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -58,10 +58,12 @@
var/canholo = TRUE
var/obj/item/card/id/access_card = null
var/chassis = "repairbot"
- var/list/possible_chassis = list("cat" = TRUE, "mouse" = TRUE, "monkey" = TRUE, "corgi" = FALSE,
- "fox" = FALSE, "repairbot" = TRUE, "rabbit" = TRUE, "borgi" = FALSE ,
- "parrot" = FALSE, "bear" = FALSE , "mushroom" = FALSE, "crow" = FALSE ,
- "fairy" = FALSE , "spiderbot" = FALSE) //assoc value is whether it can be picked up.
+ var/dynamic_chassis
+ var/dynamic_chassis_sit = FALSE //whether we're sitting instead of resting spritewise
+ var/dynamic_chassis_bellyup = FALSE //whether we're lying down bellyup
+ var/list/possible_chassis //initialized in initialize.
+ var/list/dynamic_chassis_icons //ditto.
+ var/list/chassis_pixel_offsets_x //stupid dogborgs
var/static/item_head_icon = 'icons/mob/pai_item_head.dmi'
var/static/item_lh_icon = 'icons/mob/pai_item_lh.dmi'
var/static/item_rh_icon = 'icons/mob/pai_item_rh.dmi'
@@ -69,22 +71,20 @@
var/emitterhealth = 20
var/emittermaxhealth = 20
var/emitterregen = 0.25
+ var/emitter_next_use = 0
+ var/emitter_emp_cd = 300
var/emittercd = 50
var/emitteroverloadcd = 100
- var/emittersemicd = FALSE
- var/overload_ventcrawl = 0
- var/overload_bulletblock = 0 //Why is this a good idea?
- var/overload_maxhealth = 0
+ var/radio_short = FALSE
+ var/radio_short_cooldown = 5 MINUTES
+ var/radio_short_timerid
+
canmove = FALSE
var/silent = FALSE
var/brightness_power = 5
-/mob/living/silicon/pai/can_unbuckle()
- return FALSE
-
-/mob/living/silicon/pai/can_buckle()
- return FALSE
+ var/icon/custom_holoform_icon
/mob/living/silicon/pai/Destroy()
if (loc != card)
@@ -118,6 +118,13 @@
pda.owner = text("[]", src)
pda.name = pda.owner + " (" + pda.ownjob + ")"
+ possible_chassis = typelist(NAMEOF(src, possible_chassis), list("cat" = TRUE, "mouse" = TRUE, "monkey" = TRUE, "corgi" = FALSE,
+ "fox" = FALSE, "repairbot" = TRUE, "rabbit" = TRUE, "borgi" = FALSE ,
+ "parrot" = FALSE, "bear" = FALSE , "mushroom" = FALSE, "crow" = FALSE ,
+ "fairy" = FALSE , "spiderbot" = FALSE)) //assoc value is whether it can be picked up.
+ dynamic_chassis_icons = typelist(NAMEOF(src, dynamic_chassis_icons), initialize_dynamic_chassis_icons())
+ chassis_pixel_offsets_x = typelist(NAMEOF(src, chassis_pixel_offsets_x), default_chassis_pixel_offsets_x())
+
. = ..()
var/datum/action/innate/pai/software/SW = new
@@ -133,8 +140,7 @@
AR.Grant(src)
AL.Grant(src)
ALM.Grant(src)
- emittersemicd = TRUE
- addtimer(CALLBACK(src, .proc/emittercool), 600)
+ emitter_next_use = world.time + 10 SECONDS
/mob/living/silicon/pai/Life()
if(hacking)
@@ -228,7 +234,7 @@
/datum/action/innate/pai/shell/Trigger()
..()
if(P.holoform)
- P.fold_in(0)
+ P.fold_in(FALSE)
else
P.fold_out()
@@ -292,3 +298,132 @@
/mob/living/silicon/pai/process()
emitterhealth = CLAMP((emitterhealth + emitterregen), -50, emittermaxhealth)
+
+/mob/living/silicon/pai/proc/short_radio()
+ if(radio_short_timerid)
+ deltimer(radio_short_timerid)
+ radio_short = TRUE
+ to_chat(src, "Your radio shorts out!")
+ radio_short_timerid = addtimer(CALLBACK(src, .proc/unshort_radio), radio_short_cooldown, flags = TIMER_STOPPABLE)
+
+/mob/living/silicon/pai/proc/unshort_radio()
+ radio_short = FALSE
+ to_chat(src, "You feel your radio is operational once more.")
+ if(radio_short_timerid)
+ deltimer(radio_short_timerid)
+
+/mob/living/silicon/pai/proc/initialize_dynamic_chassis_icons()
+ . = list()
+ var/icon/curr //for inserts
+
+ //This is a horrible system and I wish I was not as lazy and did something smarter, like just generating a new icon in memory which is probably more efficient.
+
+ //Basic /tg/ cyborgs
+ .["Cyborg - Engineering (default)"] = process_holoform_icon_filter(icon('icons/mob/robots.dmi', "engineer"), HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Engineering (loaderborg)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "loaderborg"), HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Engineering (handyeng)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "handyeng"), HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Engineering (sleekeng)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "sleekeng"), HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Engineering (marinaeng)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "marinaeng"), HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Medical (default)"] = process_holoform_icon_filter(icon('icons/mob/robots.dmi', "medical"), HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Medical (marinamed)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "marinamed"), HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Medical (eyebotmed)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "eyebotmed"), HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Security (default)"] = process_holoform_icon_filter(icon('icons/mob/robots.dmi', "sec"), HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Security (sleeksec)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "sleeksec"), HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Security (marinasec)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/robots.dmi', "marinasec"), HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Clown (default)"] = process_holoform_icon_filter(icon('icons/mob/robots.dmi', "clown"), HOLOFORM_FILTER_PAI, FALSE)
+
+ //Citadel dogborgs
+ //Engi
+ curr = icon('modular_citadel/icons/mob/widerobot.dmi', "valeeng")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeeng-rest"), "rest")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeeng-sit"), "sit")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeeng-bellyup"), "bellyup")
+ process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Engineering (dog - valeeng)"] = curr
+ curr = icon('modular_citadel/icons/mob/widerobot.dmi', "pupdozer")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "pupdozer-rest"), "rest")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "pupdozer-sit"), "sit")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "pupdozer-bellyup"), "bellyup")
+ process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Engineering (dog - pupdozer)"] = curr
+ //Med
+ curr = icon('modular_citadel/icons/mob/widerobot.dmi', "medihound")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "medihound-rest"), "rest")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "medihound-sit"), "sit")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "medihound-bellyup"), "bellyup")
+ process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Medical (dog - medihound)"] = curr
+ curr = icon('modular_citadel/icons/mob/widerobot.dmi', "medihounddark")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "medihounddark-rest"), "rest")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "medihounddark-sit"), "sit")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "medihounddark-bellyup"), "bellyup")
+ process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Medical (dog - medihounddark)"] = curr
+ curr = icon('modular_citadel/icons/mob/widerobot.dmi', "valemed")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valemed-rest"), "rest")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valemed-sit"), "sit")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valemed-bellyup"), "bellyup")
+ process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Medical (dog - valemed)"] = curr
+ //Sec
+ curr = icon('modular_citadel/icons/mob/widerobot.dmi', "k9")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "k9-rest"), "rest")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "k9-sit"), "sit")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "k9-bellyup"), "bellyup")
+ process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Security (dog - k9)"] = curr
+ curr = icon('modular_citadel/icons/mob/widerobot.dmi', "k9dark")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "k9dark-rest"), "rest")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "k9dark-sit"), "sit")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "k9dark-bellyup"), "bellyup")
+ process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Security (dog - k9dark)"] = curr
+ curr = icon('modular_citadel/icons/mob/widerobot.dmi', "valesec")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valesec-rest"), "rest")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valesec-sit"), "sit")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valesec-bellyup"), "bellyup")
+ process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Security (dog - valesec)"] = curr
+ //Service
+ curr = icon('modular_citadel/icons/mob/widerobot.dmi', "valeserv")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeserv-rest"), "rest")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeserv-sit"), "sit")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeserv-bellyup"), "bellyup")
+ process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Service (dog - valeserv)"] = curr
+ curr = icon('modular_citadel/icons/mob/widerobot.dmi', "valeservdark")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeservdark-rest"), "rest")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeservdark-sit"), "sit")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valeservdark-bellyup"), "bellyup")
+ process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Service (dog - valeservdark)"] = curr
+ //Sci
+ curr = icon('modular_citadel/icons/mob/widerobot.dmi', "valesci")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valesci-rest"), "rest")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valesci-sit"), "sit")
+ curr.Insert(icon('modular_citadel/icons/mob/widerobot.dmi', "valesci-bellyup"), "bellyup")
+ process_holoform_icon_filter(curr, HOLOFORM_FILTER_PAI, FALSE)
+ .["Cyborg - Science (dog - valesci)"] = curr
+ //Misc
+ .["Cyborg - Misc (dog - blade)"] = process_holoform_icon_filter(icon('modular_citadel/icons/mob/widerobot.dmi', "blade"), HOLOFORM_FILTER_PAI, FALSE)
+
+/mob/living/silicon/pai/proc/default_chassis_pixel_offsets_x()
+ . = list()
+ //Engi
+ .["Cyborg - Engineering (dog - valeeng)"] = -16
+ .["Cyborg - Engineering (dog - pupdozer)"] = -16
+ //Med
+ .["Cyborg - Medical (dog - medihound)"] = -16
+ .["Cyborg - Medical (dog - medihounddark)"] = -16
+ .["Cyborg - Medical (dog - valemed)"] = -16
+ //Sec
+ .["Cyborg - Security (dog - k9)"] = -16
+ .["Cyborg - Security (dog - valesec)"] = -16
+ .["Cyborg - Security (dog - k9dark)"] = -16
+ //Service
+ .["Cyborg - Service (dog - valeserv)"] = -16
+ .["Cyborg - Service (dog - valeservdark)"] = -16
+ //Sci
+ .["Cyborg - Security (dog - valesci)"] = -16
+ //Misc
+ .["Cyborg - Misc (dog - blade)"] = -16
diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm
index dfc718f1ab..c727e100d8 100644
--- a/code/modules/mob/living/silicon/pai/pai_defense.dm
+++ b/code/modules/mob/living/silicon/pai/pai_defense.dm
@@ -8,9 +8,10 @@
return
take_holo_damage(50/severity)
Knockdown(400/severity)
- silent = max(30/severity, silent)
+ silent = max((3 MINUTES)/severity, silent)
if(holoform)
fold_in(force = TRUE)
+ emitter_next_use = world.time + emitter_emp_cd
//Need more effects that aren't instadeath or permanent law corruption.
/mob/living/silicon/pai/ex_act(severity, target)
@@ -26,13 +27,14 @@
fold_in(force = 1)
Knockdown(200)
+//ATTACK HAND IGNORING PARENT RETURN VALUE
/mob/living/silicon/pai/attack_hand(mob/living/carbon/human/user)
switch(user.a_intent)
- if("help")
+ if(INTENT_HELP)
visible_message("[user] gently pats [src] on the head, eliciting an off-putting buzzing from its holographic field.")
- if("disarm")
+ if(INTENT_DISARM)
visible_message("[user] boops [src] on the head!")
- if("harm")
+ if(INTENT_HARM)
user.do_attack_animation(src)
if (user.name == master)
visible_message("Responding to its master's touch, [src] disengages its holochassis emitter, rapidly losing coherence.")
@@ -41,14 +43,19 @@
if(user.put_in_hands(card))
user.visible_message("[user] promptly scoops up [user.p_their()] pAI's card.")
else
+ if(HAS_TRAIT(user, TRAIT_PACIFISM))
+ to_chat(user, "You don't want to hurt [src]!")
+ return
visible_message("[user] stomps on [src]!.")
take_holo_damage(2)
+ else
+ grabbedby(user)
-/mob/living/silicon/pai/bullet_act(obj/item/projectile/Proj)
- if(Proj.stun)
+/mob/living/silicon/pai/bullet_act(obj/item/projectile/P, def_zone)
+ if(P.stun)
fold_in(force = TRUE)
- src.visible_message("The electrically-charged projectile disrupts [src]'s holomatrix, forcing [src] to fold in!")
- . = ..(Proj)
+ visible_message("The electrically-charged projectile disrupts [src]'s holomatrix, forcing [src] to fold in!")
+ . = ..()
/mob/living/silicon/pai/stripPanelUnequip(obj/item/what, mob/who, where) //prevents stripping
to_chat(src, "Your holochassis stutters and warps intensely as you attempt to interact with the object, forcing you to cease lest the field fail.")
diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm
index 164a3e7389..6577c26402 100644
--- a/code/modules/mob/living/silicon/pai/pai_shell.dm
+++ b/code/modules/mob/living/silicon/pai/pai_shell.dm
@@ -12,12 +12,11 @@
. = fold_in(force)
return
- if(emittersemicd)
+ if(world.time < emitter_next_use)
to_chat(src, "Error: Holochassis emitters recycling. Please try again later.")
return FALSE
- emittersemicd = TRUE
- addtimer(CALLBACK(src, .proc/emittercool), emittercd)
+ emitter_next_use = world.time + emittercd
canmove = TRUE
density = TRUE
if(istype(card.loc, /obj/item/pda))
@@ -46,20 +45,17 @@
visible_message("[src] folds out its holochassis emitter and forms a holoshell around itself!")
holoform = TRUE
-/mob/living/silicon/pai/proc/emittercool()
- emittersemicd = FALSE
-
/mob/living/silicon/pai/proc/fold_in(force = FALSE)
- emittersemicd = TRUE
- if(!force)
- addtimer(CALLBACK(src, .proc/emittercool), emittercd)
- else
- addtimer(CALLBACK(src, .proc/emittercool), emitteroverloadcd)
+ emitter_next_use = world.time + (force? emitteroverloadcd : emittercd)
icon_state = "[chassis]"
if(!holoform)
. = fold_out(force)
return
- visible_message("[src] deactivates its holochassis emitter and folds back into a compact card!")
+ if(force)
+ short_radio()
+ visible_message("[src] shorts out, collapsing back into their storage card, sparks emitted from their radio antenna!")
+ else
+ visible_message("[src] deactivates its holochassis emitter and folds back into a compact card!")
stop_pulling()
if(client)
client.perspective = EYE_PERSPECTIVE
@@ -78,28 +74,39 @@
if(!isturf(loc) && loc != card)
to_chat(src, "You can not change your holochassis composite while not on the ground or in your card!")
return FALSE
- var/choice = input(src, "What would you like to use for your holochassis composite?") as null|anything in possible_chassis
- if(!choice)
+ var/list/choices = list("Preset - Basic", "Preset - Dynamic")
+ if(CONFIG_GET(flag/pai_custom_holoforms))
+ choices += "Custom"
+ var/choicetype = input(src, "What type of chassis do you want to use?") as null|anything in choices
+ if(!choicetype)
return FALSE
- chassis = choice
- icon_state = "[chassis]"
- if(resting)
- icon_state = "[chassis]_rest"
+ switch(choicetype)
+ if("Custom")
+ chassis = "custom"
+ if("Preset - Basic")
+ var/choice = input(src, "What would you like to use for your holochassis composite?") as null|anything in possible_chassis
+ if(!choice)
+ return FALSE
+ chassis = choice
+ if("Preset - Dynamic")
+ var/choice = input(src, "What would you like to use for your holochassis composite?") as null|anything in dynamic_chassis_icons
+ if(!choice)
+ return FALSE
+ chassis = "dynamic"
+ dynamic_chassis = choice
+ resist_a_rest(FALSE, TRUE)
+ update_icon()
to_chat(src, "You switch your holochassis projection composite to [chassis]")
/mob/living/silicon/pai/lay_down()
- ..()
- update_resting_icon(resting)
-
-/mob/living/silicon/pai/proc/update_resting_icon(rest)
- if(rest)
- icon_state = "[chassis]_rest"
- else
- icon_state = "[chassis]"
+ . = ..()
if(loc != card)
- visible_message("[src] [rest? "lays down for a moment..." : "perks up from the ground"]")
+ visible_message("[src] [resting? "lays down for a moment..." : "perks up from the ground"]")
+ update_icon()
-/mob/living/silicon/pai/start_pulling(atom/movable/AM)
+/mob/living/silicon/pai/start_pulling(atom/movable/AM, gs)
+ if(ispAI(AM))
+ return ..()
return FALSE
/mob/living/silicon/pai/proc/toggle_integrated_light()
@@ -122,3 +129,22 @@
to_chat(user, "[src]'s current form isn't able to be carried!")
return FALSE
return ..()
+
+/mob/living/silicon/pai/verb/toggle_chassis_sit()
+ set name = "Toggle Chassis Sit"
+ set category = "IC"
+ set desc = "Whether or not to try to use a sitting icon versus a resting icon. Takes priority over belly-up resting."
+ dynamic_chassis_sit = !dynamic_chassis_sit
+ to_chat(usr, "You are now [dynamic_chassis_sit? "sitting" : "lying down"].")
+ update_icon()
+
+/mob/living/silicon/pai/verb/toggle_chassis_bellyup()
+ set name = "Toggle Chassis Belly Up"
+ set category = "IC"
+ set desc = "Whether or not to try to use a belly up icon while resting. Overridden by sitting."
+ dynamic_chassis_bellyup = !dynamic_chassis_bellyup
+ to_chat(usr, "You are now lying on your [dynamic_chassis_bellyup? "back" : "front"].")
+ update_icon()
+
+/mob/living/silicon/pai/can_buckle_others(mob/living/target, atom/buckle_to)
+ return ispAI(target) && ..()
diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm
index 9f07900a25..deedaa1382 100644
--- a/code/modules/mob/living/silicon/pai/say.dm
+++ b/code/modules/mob/living/silicon/pai/say.dm
@@ -5,4 +5,11 @@
..(message)
/mob/living/silicon/pai/binarycheck()
- return 0
+ return FALSE
+
+/mob/living/silicon/pai/radio(message, message_mode, list/spans, language)
+ if((message_mode == "robot") || (message_mode in GLOB.radiochannels))
+ if(radio_short)
+ to_chat(src, "Your radio is shorted out!")
+ return ITALICS | REDUCE_RANGE
+ return ..()
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 9882d028d1..3ea018ccf6 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -283,7 +283,10 @@
dat += "Refresh
"
// Built-in
dat += "Directives
"
- dat += "Radio Configuration
"
+ if(radio_short)
+ dat += "\[RADIO SHORTED - Recalibrating!\]"
+ else
+ dat += "Radio Configuration
"
dat += "Screen Display
"
//dat += "Text Messaging
"
dat += "
"
diff --git a/code/modules/mob/living/silicon/pai/update_icon.dm b/code/modules/mob/living/silicon/pai/update_icon.dm
new file mode 100644
index 0000000000..9e40b71c5d
--- /dev/null
+++ b/code/modules/mob/living/silicon/pai/update_icon.dm
@@ -0,0 +1,27 @@
+/mob/living/silicon/pai/update_icon()
+ if(chassis == "custom") //Make sure custom exists if it's set to custom
+ custom_holoform_icon = client?.prefs?.get_filtered_holoform(HOLOFORM_FILTER_PAI)
+ if(!custom_holoform_icon)
+ chassis = pick(possible_chassis - "custom")
+ if(chassis == "dynamic") //handle dynamic generated icons
+ icon = dynamic_chassis_icons[dynamic_chassis]
+ var/list/states = icon_states(icon)
+ icon_state = ""
+ if(resting) //The next line is some bullshit but I can make it worse if you want and make it a single line instead of four.. :)
+ if(dynamic_chassis_sit && ("sit") in states)
+ icon_state = "sit"
+ else if(dynamic_chassis_bellyup && ("bellyup") in states)
+ icon_state = "bellyup"
+ else if("rest" in states)
+ icon_state = "rest"
+ rotate_on_lying = FALSE
+ else if(chassis == "custom")
+ icon = custom_holoform_icon
+ icon_state = ""
+ rotate_on_lying = TRUE
+ else
+ icon = initial(icon)
+ icon_state = "[chassis][resting? "_rest" : (stat == DEAD? "_dead" : "")]"
+ rotate_on_lying = FALSE
+ pixel_x = ((chassis == "dynamic") && chassis_pixel_offsets_x[dynamic_chassis]) || 0
+ update_transform()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 5df24406c5..5f7d3ca243 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1298,4 +1298,12 @@
/mob/living/silicon/robot/adjustStaminaLossBuffered(amount, updating_health = 1)
if(istype(cell))
- cell.charge -= amount*5
\ No newline at end of file
+ cell.charge -= amount*5
+
+/mob/living/silicon/robot/verb/viewmanifest()
+ set category = "Robot Commands"
+ set name = "View Crew Manifest"
+
+ if(usr.stat == DEAD)
+ return //won't work if dead
+ ai_roster()
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 0f09b6f62a..7e06c66eff 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -13,7 +13,19 @@
spark_system.start()
return ..()
+/mob/living/silicon/robot/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+ . = ..()
+ if(.)
+ spark_system.start()
+ spawn(0)
+ step_away(src,user,15)
+ sleep(3)
+ step_away(src,user,15)
+
/mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M)
+ . = ..()
+ if(!.) // the attack was blocked or was help/grab intent
+ return
if (M.a_intent == INTENT_DISARM)
if(!(lying))
M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
@@ -30,24 +42,19 @@
visible_message("[M] has forced back [src]!", \
"[M] has forced back [src]!", null, COMBAT_MESSAGE_RANGE)
playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1)
- else
- ..()
- return
/mob/living/silicon/robot/attack_slime(mob/living/simple_animal/slime/M)
- if(..()) //successful slime shock
- flash_act()
- var/stunprob = M.powerlevel * 7 + 10
- if(prob(stunprob) && M.powerlevel >= 8)
- adjustBruteLoss(M.powerlevel * rand(6,10))
-
- var/damage = rand(1, 3)
-
+ . = ..()
+ if(!.) //unsuccessful slime shock
+ return
+ var/stunprob = M.powerlevel * 7 + 10
+ var/damage = M.powerlevel * rand(6,10)
+ if(prob(stunprob) && M.powerlevel >= 8)
+ flash_act(affect_silicon = TRUE) //my borg eyes!
if(M.is_adult)
- damage = rand(20, 40)
+ damage += rand(10, 20)
else
- damage = rand(5, 35)
- damage = round(damage / 2) // borgs receive half damage
+ damage += rand(2, 17)
adjustBruteLoss(damage)
updatehealth()
@@ -56,23 +63,17 @@
//ATTACK HAND IGNORING PARENT RETURN VALUE
/mob/living/silicon/robot/attack_hand(mob/living/carbon/human/user)
add_fingerprint(user)
- if(opened && !wiresexposed && !issilicon(user))
- if(cell)
- cell.update_icon()
- cell.add_fingerprint(user)
- user.put_in_active_hand(cell)
- to_chat(user, "You remove \the [cell].")
- cell = null
- update_icons()
- diag_hud_set_borgcell()
+ if(opened && !wiresexposed && cell && !issilicon(user))
+ cell.update_icon()
+ cell.add_fingerprint(user)
+ user.put_in_active_hand(cell)
+ to_chat(user, "You remove \the [cell].")
+ cell = null
+ update_icons()
+ diag_hud_set_borgcell()
if(!opened)
- if(..()) // hulk attack
- spark_system.start()
- spawn(0)
- step_away(src,user,15)
- sleep(3)
- step_away(src,user,15)
+ return ..()
/mob/living/silicon/robot/fire_act()
if(!on_fire) //Silicons don't gain stacks from hotspots, but hotspots can ignite them
@@ -182,9 +183,9 @@
if (stat != DEAD)
adjustBruteLoss(30)
-/mob/living/silicon/robot/bullet_act(var/obj/item/projectile/Proj)
- ..(Proj)
+/mob/living/silicon/robot/bullet_act(obj/item/projectile/P, def_zone)
+ ..()
updatehealth()
- if(prob(75) && Proj.damage > 0)
+ if(prob(75) && P.damage > 0)
spark_system.start()
return 2
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index b9cee43138..699105ac4c 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -389,6 +389,15 @@
if (aicamera)
return aicamera.selectpicture(user)
+/mob/living/silicon/proc/ai_roster()
+ var/dat = "Crew RosterCrew Roster:
"
+
+ dat += GLOB.data_core.get_manifest()
+ dat += ""
+
+ src << browse(dat, "window=airoster")
+ onclose(src, "airoster")
+
/mob/living/silicon/update_transform()
var/matrix/ntransform = matrix(transform) //aka transform.Copy()
var/changed = 0
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index 073a2eec2b..ca8ad25713 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -6,7 +6,10 @@
return 2
/mob/living/silicon/attack_alien(mob/living/carbon/alien/humanoid/M)
- if(..()) //if harm or disarm intent
+ . = ..()
+ if(!.) // the attack was blocked or was help/grab intent
+ return
+ if(M.a_intent == INTENT_HARM)
var/damage = 20
if (prob(90))
log_combat(M, src, "attacked")
@@ -49,34 +52,33 @@
/mob/living/silicon/attack_paw(mob/living/user)
return attack_hand(user)
-/mob/living/silicon/attack_larva(mob/living/carbon/alien/larva/L)
- if(L.a_intent == INTENT_HELP)
- visible_message("[L.name] rubs its head against [src].")
-
-/mob/living/silicon/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+/mob/living/silicon/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
if(user.a_intent == INTENT_HARM)
- ..(user, 1)
+ . = ..(user, TRUE)
+ if(.)
+ return
adjustBruteLoss(rand(10, 15))
playsound(loc, "punch", 25, 1, -1)
visible_message("[user] has punched [src]!", \
"[user] has punched [src]!")
- return 1
- return 0
+ return TRUE
+ return FALSE
-//ATTACK HAND IGNORING PARENT RETURN VALUE
/mob/living/silicon/attack_hand(mob/living/carbon/human/M)
+ . = ..()
+ if(.) //the attack was blocked
+ return
switch(M.a_intent)
- if ("help")
+ if (INTENT_HELP)
M.visible_message("[M] pets [src].", \
"You pet [src].")
- if("grab")
+ if(INTENT_GRAB)
grabbedby(M)
else
M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
playsound(src.loc, 'sound/effects/bang.ogg', 10, 1)
visible_message("[M] punches [src], but doesn't leave a dent.", \
"[M] punches [src], but doesn't leave a dent.", null, COMBAT_MESSAGE_RANGE)
- return 0
/mob/living/silicon/attack_drone(mob/living/simple_animal/drone/M)
if(M.a_intent == INTENT_HARM)
@@ -108,19 +110,25 @@
M.visible_message("[M] is thrown off of [src]!")
flash_act(affect_silicon = 1)
-/mob/living/silicon/bullet_act(obj/item/projectile/Proj)
- if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
- adjustBruteLoss(Proj.damage)
- if(prob(Proj.damage*1.5))
+/mob/living/silicon/bullet_act(obj/item/projectile/P, def_zone)
+ if(P.original != src || P.firer != src) //try to block or reflect the bullet, can't do so when shooting oneself
+ if(reflect_bullet_check(P, def_zone))
+ return -1 // complete projectile permutation
+ if(check_shields(P, P.damage, "the [P.name]", PROJECTILE_ATTACK, P.armour_penetration))
+ P.on_hit(src, 100, def_zone)
+ return 2
+ if((P.damage_type == BRUTE || P.damage_type == BURN))
+ adjustBruteLoss(P.damage)
+ if(prob(P.damage*1.5))
for(var/mob/living/M in buckled_mobs)
M.visible_message("[M] is knocked off of [src]!")
unbuckle_mob(M)
M.Knockdown(40)
- if(Proj.stun || Proj.knockdown)
+ if(P.stun || P.knockdown)
for(var/mob/living/M in buckled_mobs)
unbuckle_mob(M)
- M.visible_message("[M] is knocked off of [src] by the [Proj]!")
- Proj.on_hit(src)
+ M.visible_message("[M] is knocked off of [src] by the [P]!")
+ P.on_hit(src)
return 2
/mob/living/silicon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash/static)
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index 793df63c87..0dfa126e79 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -1,20 +1,22 @@
/mob/living/simple_animal/attack_hand(mob/living/carbon/human/M)
- ..()
+ . = ..()
+ if(.) //the attack was blocked
+ return
switch(M.a_intent)
- if("help")
+ if(INTENT_HELP)
if (health > 0)
visible_message("[M] [response_help] [src].")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
- if("grab")
+ if(INTENT_GRAB)
if(grab_state >= GRAB_AGGRESSIVE && isliving(pulling))
vore_attack(M, pulling)
else
grabbedby(M)
- if("harm", "disarm")
+ if(INTENT_HARM, INTENT_DISARM)
if(HAS_TRAIT(M, TRAIT_PACIFISM))
to_chat(M, "You don't want to hurt [src]!")
return
@@ -27,12 +29,11 @@
updatehealth()
return TRUE
-/mob/living/simple_animal/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
+/mob/living/simple_animal/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
if(user.a_intent == INTENT_HARM)
- if(HAS_TRAIT(user, TRAIT_PACIFISM))
- to_chat(user, "You don't want to hurt [src]!")
- return FALSE
- ..(user, 1)
+ . = ..(user, TRUE)
+ if(.)
+ return
playsound(loc, "punch", 25, 1, -1)
visible_message("[user] has punched [src]!", \
"[user] has punched [src]!", null, COMBAT_MESSAGE_RANGE)
@@ -40,32 +41,32 @@
return TRUE
/mob/living/simple_animal/attack_paw(mob/living/carbon/monkey/M)
- if(..()) //successful monkey bite.
- if(stat != DEAD)
- var/damage = rand(1, 3)
- attack_threshold_check(damage)
- return 1
+ . = ..()
+ if(.) //successful larva bite
+ var/damage = rand(1, 3)
+ attack_threshold_check(damage)
+ return 1
if (M.a_intent == INTENT_HELP)
if (health > 0)
visible_message("[M.name] [response_help] [src].")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-
/mob/living/simple_animal/attack_alien(mob/living/carbon/alien/humanoid/M)
- if(..()) //if harm or disarm intent.
- if(M.a_intent == INTENT_DISARM)
- playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
- visible_message("[M] [response_disarm] [name]!", \
- "[M] [response_disarm] [name]!", null, COMBAT_MESSAGE_RANGE)
- log_combat(M, src, "disarmed")
- else
- var/damage = rand(15, 30)
- visible_message("[M] has slashed at [src]!", \
- "[M] has slashed at [src]!", null, COMBAT_MESSAGE_RANGE)
- playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
- attack_threshold_check(damage)
- log_combat(M, src, "attacked")
- return 1
+ . = ..()
+ if(!.) // the attack was blocked or was help/grab intent
+ return
+ if(M.a_intent == INTENT_DISARM)
+ playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
+ visible_message("[M] [response_disarm] [name]!", \
+ "[M] [response_disarm] [name]!", null, COMBAT_MESSAGE_RANGE)
+ log_combat(M, src, "disarmed")
+ else
+ var/damage = rand(15, 30)
+ visible_message("[M] has slashed at [src]!", \
+ "[M] has slashed at [src]!", null, COMBAT_MESSAGE_RANGE)
+ playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+ attack_threshold_check(damage)
+ log_combat(M, src, "attacked")
/mob/living/simple_animal/attack_larva(mob/living/carbon/alien/larva/L)
. = ..()
@@ -82,7 +83,8 @@
return attack_threshold_check(damage, M.melee_damage_type)
/mob/living/simple_animal/attack_slime(mob/living/simple_animal/slime/M)
- if(..()) //successful slime attack
+ . = ..()
+ if(.) //successful slime shock
var/damage = rand(15, 25)
if(M.is_adult)
damage = rand(20, 35)
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index 396c6de166..cae707ce46 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -318,9 +318,9 @@
sleep(50)
if(mode == BOT_REPAIRING && src.loc == target_turf)
if(autotile) //Build the floor and include a tile.
- target_turf.PlaceOnTop(/turf/open/floor/plasteel)
+ target_turf.PlaceOnTop(/turf/open/floor/plasteel, flags = CHANGETURF_INHERIT_AIR)
else //Build a hull plating without a floor tile.
- target_turf.PlaceOnTop(/turf/open/floor/plating)
+ target_turf.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
else
var/turf/open/floor/F = target_turf
@@ -334,7 +334,7 @@
if(mode == BOT_REPAIRING && F && src.loc == F)
F.broken = 0
F.burnt = 0
- F.PlaceOnTop(/turf/open/floor/plasteel)
+ F.PlaceOnTop(/turf/open/floor/plasteel, flags = CHANGETURF_INHERIT_AIR)
if(replacetiles && F.type != initial(tiletype.turf_type) && specialtiles && !isplatingturf(F))
anchored = TRUE
@@ -345,7 +345,7 @@
if(mode == BOT_REPAIRING && F && src.loc == F)
F.broken = 0
F.burnt = 0
- F.PlaceOnTop(initial(tiletype.turf_type))
+ F.PlaceOnTop(initial(tiletype.turf_type), flags = CHANGETURF_INHERIT_AIR)
specialtiles -= 1
if(specialtiles == 0)
speak("Requesting refill of custom floortiles to continue replacing.")
diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm
index 2de4ca39fd..109c7b4636 100644
--- a/code/modules/mob/living/simple_animal/bot/honkbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm
@@ -113,7 +113,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"},
mode = BOT_HUNT
/mob/living/simple_animal/bot/honkbot/attack_hand(mob/living/carbon/human/H)
- if(H.a_intent == "harm")
+ if(H.a_intent == INTENT_HARM)
retaliate(H)
addtimer(CALLBACK(src, .proc/react_buzz), 5)
return ..()
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 02e171e4c4..bda309f7c7 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -232,9 +232,9 @@
/mob/living/simple_animal/pet/cat/attack_hand(mob/living/carbon/human/M)
. = ..()
switch(M.a_intent)
- if("help")
+ if(INTENT_HELP)
wuv(1, M)
- if("harm")
+ if(INTENT_HARM)
wuv(-1, M)
/mob/living/simple_animal/pet/cat/proc/wuv(change, mob/M)
@@ -290,7 +290,9 @@
D.decorate_donut()
/mob/living/simple_animal/pet/cat/cak/attack_hand(mob/living/L)
- ..()
+ . = ..()
+ if(.) //the attack was blocked
+ return
if(L.a_intent == INTENT_HARM && L.reagents && !stat)
L.reagents.add_reagent("nutriment", 0.4)
L.reagents.add_reagent("vitamin", 0.4)
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 0d933d171b..986e5c9b4d 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -643,9 +643,9 @@
/mob/living/simple_animal/pet/dog/attack_hand(mob/living/carbon/human/M)
. = ..()
switch(M.a_intent)
- if("help")
+ if(INTENT_HELP)
wuv(1,M)
- if("harm")
+ if(INTENT_HARM)
wuv(-1,M)
/mob/living/simple_animal/pet/dog/proc/wuv(change, mob/M)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
index 521f458e2f..0f7b534d4f 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
@@ -130,6 +130,7 @@
hacked = TRUE
visualAppearence = CLOCKDRONE
can_be_held = FALSE
+ mouse_opacity = MOUSE_OPACITY_OPAQUE
flavortext = "You are a cogscarab, a tiny building construct of Ratvar. While you're weak and can't recite scripture, \
you have a set of quick tools, as well as a replica fabricator that can create brass and convert objects.
Work with the servants of Ratvar \
to construct and maintain defenses at the City of Cogs. If there are no servants, use this time to experiment with base designs!"
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
index e40eb585e8..c9207fcf89 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
@@ -31,9 +31,9 @@
//picky up the drone c:
/mob/living/simple_animal/drone/attack_hand(mob/user)
- ..()
- if(user.a_intent == INTENT_HELP)
- mob_try_pickup(user)
+ if(user.a_intent != INTENT_HELP)
+ return ..() // TODO: convert picking up mobs into an element or component.
+ mob_try_pickup(user)
/mob/living/simple_animal/drone/proc/try_reactivate(mob/living/user)
var/mob/dead/observer/G = get_ghost()
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index 1bd434b233..62c8588ac8 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -424,9 +424,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
var/mob/living/simple_animal/hostile/guardian/G = input(src, "Pick the guardian you wish to reset", "Guardian Reset") as null|anything in guardians
if(G)
to_chat(src, "You attempt to reset [G.real_name]'s personality...")
- var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as [src.real_name]'s [G.real_name]?", ROLE_PAI, null, FALSE, 100)
+ var/list/mob/candidates = pollGhostCandidates("Do you want to play as [src.real_name]'s [G.real_name]?", ROLE_PAI, null, FALSE, 100)
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
to_chat(G, "Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.")
to_chat(src, "Your [G.real_name] has been successfully reset.")
message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(G)])")
@@ -498,10 +498,10 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
return
used = TRUE
to_chat(user, "[use_message]")
- var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_HOLOPARASITE)
+ var/list/mob/candidates = pollGhostCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_HOLOPARASITE)
if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
+ var/mob/C = pick(candidates)
spawn_guardian(user, C.key)
else
to_chat(user, "[failure_message]")
diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
index 49514d0d12..914d38022f 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
@@ -54,10 +54,8 @@
var/blocked = FALSE
if(hasmatchingsummoner(A)) //if the summoner matches don't hurt them
blocked = TRUE
- if(ishuman(A))
- var/mob/living/carbon/human/H = A
- if(H.check_shields(src, 90, "[name]", attack_type = THROWN_PROJECTILE_ATTACK))
- blocked = TRUE
+ if(L.check_shields(src, 90, "[name]", attack_type = THROWN_PROJECTILE_ATTACK))
+ blocked = TRUE
if(!blocked)
L.drop_all_held_items()
L.visible_message("[src] slams into [L]!", "[src] slams into you!")
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 51a9d8d62b..c2c9f5a71f 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -486,10 +486,7 @@ Difficulty: Very Hard
if(isturf(Stuff))
var/turf/T = Stuff
if((isspaceturf(T) || isfloorturf(T)) && NewTerrainFloors)
- var/turf/open/O = T.ChangeTurf(NewTerrainFloors)
- if(O.air)
- var/datum/gas_mixture/G = O.air
- G.copy_from_turf(O)
+ var/turf/open/O = T.ChangeTurf(NewTerrainFloors, flags = CHANGETURF_INHERIT_AIR)
if(prob(florachance) && NewFlora.len && !is_blocked_turf(O, TRUE))
var/atom/Picked = pick(NewFlora)
new Picked(O)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 397d40925b..7cfae9310a 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -594,12 +594,15 @@ Difficulty: Normal
var/list/hit_things = list() //we hit these already, ignore them
var/friendly_fire_check = FALSE
var/bursting = FALSE //if we're bursting and need to hit anyone crossing us
+ var/list/nohurt
-/obj/effect/temp_visual/hierophant/blast/Initialize(mapload, new_caster, friendly_fire, list/only_hit_once)
+/obj/effect/temp_visual/hierophant/blast/Initialize(mapload, new_caster, friendly_fire, list/only_hit_once, list/donthurt = null)
. = ..()
if(only_hit_once)
hit_things = only_hit_once
friendly_fire_check = friendly_fire
+ if(donthurt)
+ hit_things += donthurt
if(new_caster)
hit_things += new_caster
if(ismineralturf(loc)) //drill mineral turfs
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index 8c2fbef15e..c6386540f7 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -25,7 +25,7 @@
mob_size = MOB_SIZE_LARGE
layer = LARGE_MOB_LAYER //Looks weird with them slipping under mineral walls and cameras and shit otherwise
mouse_opacity = MOUSE_OPACITY_OPAQUE // Easier to click on in melee, they're giant targets anyway
- flags_1 = PREVENT_CONTENTS_EXPLOSION_1
+ flags_1 = PREVENT_CONTENTS_EXPLOSION_1 | HEAR_1
var/list/crusher_loot
var/medal_type
var/score_type = BOSS_SCORE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
index 04a1b4a468..0a8320788e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm
@@ -24,7 +24,8 @@
var/list/attack_action_types = list()
var/can_talk = FALSE
var/obj/loot_drop = null
-
+ var/owner
+
//Gives player-controlled variants the ability to swap attacks
/mob/living/simple_animal/hostile/asteroid/elite/Initialize(mapload)
. = ..()
@@ -53,14 +54,14 @@
if(ismineralturf(target))
var/turf/closed/mineral/M = target
M.gets_drilled()
-
+
//Elites can't talk (normally)!
/mob/living/simple_animal/hostile/asteroid/elite/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
if(can_talk)
. = ..()
return TRUE
return FALSE
-
+
/*Basic setup for elite attacks, based on Whoneedspace's megafauna attack setup.
While using this makes the system rely on OnFire, it still gives options for timers not tied to OnFire, and it makes using attacks consistent accross the board for player-controlled elites.*/
@@ -82,11 +83,11 @@ While using this makes the system rely on OnFire, it still gives options for tim
/datum/action/innate/elite_attack/Activate()
M.chosen_attack = chosen_attack_num
to_chat(M, chosen_message)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/updatehealth()
. = ..()
update_health_hud()
-
+
/mob/living/simple_animal/hostile/asteroid/elite/update_health_hud()
if(hud_used)
var/severity = 0
@@ -144,7 +145,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
gpstag = "Menacing Signal"
desc = "You're not quite sure how a signal can be menacing."
invisibility = 100
-
+
/obj/structure/elite_tumor/attack_hand(mob/user)
. = ..()
if(ishuman(user))
@@ -179,7 +180,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
activity = TUMOR_INACTIVE
activator = null
-
+
obj/structure/elite_tumor/proc/spawn_elite(var/mob/dead/observer/elitemind)
var/selectedspawn = pick(potentialspawns)
mychild = new selectedspawn(loc)
@@ -199,18 +200,18 @@ obj/structure/elite_tumor/proc/return_elite()
if(boosted)
mychild.maxHealth = mychild.maxHealth * 2
mychild.health = mychild.maxHealth
-
+
/obj/structure/elite_tumor/Initialize(mapload)
. = ..()
internal = new/obj/item/gps/internal/elite(src)
START_PROCESSING(SSobj, src)
-
+
/obj/structure/elite_tumor/Destroy()
STOP_PROCESSING(SSobj, src)
mychild = null
activator = null
return ..()
-
+
/obj/structure/elite_tumor/process()
if(isturf(loc))
for(var/mob/living/simple_animal/hostile/asteroid/elite/elitehere in loc)
@@ -218,7 +219,7 @@ obj/structure/elite_tumor/proc/return_elite()
mychild.adjustHealth(-mychild.maxHealth*0.05)
var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(mychild))
H.color = "#FF0000"
-
+
/obj/structure/elite_tumor/attackby(obj/item/I, mob/user, params)
. = ..()
if(istype(I, /obj/item/organ/regenerative_core) && activity == TUMOR_INACTIVE && !boosted)
@@ -232,7 +233,7 @@ obj/structure/elite_tumor/proc/return_elite()
desc = "[desc] This one seems to glow with a strong intensity."
qdel(core)
return TRUE
-
+
/obj/structure/elite_tumor/proc/arena_checks()
if(activity != TUMOR_ACTIVE || QDELETED(src))
return
@@ -240,13 +241,13 @@ obj/structure/elite_tumor/proc/return_elite()
INVOKE_ASYNC(src, .proc/arena_trap) //Gets another arena trap queued up for when this one runs out.
INVOKE_ASYNC(src, .proc/border_check) //Checks to see if our fighters got out of the arena somehow.
addtimer(CALLBACK(src, .proc/arena_checks), 50)
-
+
/obj/structure/elite_tumor/proc/fighters_check()
if(activator != null && activator.stat == DEAD || activity == TUMOR_ACTIVE && QDELETED(activator))
onEliteWon()
if(mychild != null && mychild.stat == DEAD || activity == TUMOR_ACTIVE && QDELETED(mychild))
onEliteLoss()
-
+
/obj/structure/elite_tumor/proc/arena_trap()
var/turf/T = get_turf(src)
if(loc == null)
@@ -257,7 +258,7 @@ obj/structure/elite_tumor/proc/return_elite()
newwall = new /obj/effect/temp_visual/elite_tumor_wall(t, src)
newwall.activator = src.activator
newwall.ourelite = src.mychild
-
+
/obj/structure/elite_tumor/proc/border_check()
if(activator != null && get_dist(src, activator) >= 12)
activator.forceMove(loc)
@@ -267,7 +268,7 @@ obj/structure/elite_tumor/proc/return_elite()
mychild.forceMove(loc)
visible_message("[mychild] suddenly reappears above [src]!")
playsound(loc,'sound/effects/phasein.ogg', 200, 0, 50, TRUE, TRUE)
-
+
obj/structure/elite_tumor/proc/onEliteLoss()
playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, 0, 50, TRUE, TRUE)
visible_message("[src] begins to convulse violently before beginning to dissipate.")
@@ -286,7 +287,7 @@ obj/structure/elite_tumor/proc/onEliteLoss()
mychild = null
activator = null
qdel(src)
-
+
obj/structure/elite_tumor/proc/onEliteWon()
activity = TUMOR_PASSIVE
activator = null
@@ -300,7 +301,7 @@ obj/structure/elite_tumor/proc/onEliteWon()
to_chat(mychild, "As the life in the activator's eyes fade, the forcefield around you dies out and you feel your power subside.\nDespite this inferno being your home, you feel as if you aren't welcome here anymore.\nWithout any guidance, your purpose is now for you to decide.")
to_chat(mychild, "Your max health has been halved, but can now heal by standing on your tumor. Note, it's your only way to heal.\nBear in mind, if anyone interacts with your tumor, you'll be resummoned here to carry out another fight. In such a case, you will regain your full max health.\nAlso, be weary of your fellow inhabitants, they likely won't be happy to see you!")
to_chat(mychild, "Note that you are a lavaland monster, and thus not allied to the station. You should not cooperate or act friendly with any station crew unless under extreme circumstances!")
-
+
/obj/item/tumor_shard
name = "tumor shard"
desc = "A strange, sharp, crystal shard from an odd tumor on Lavaland. Stabbing the corpse of a lavaland elite with this will revive them, assuming their soul still lingers. Revived lavaland elites only have half their max health, but are completely loyal to their reviver."
@@ -313,7 +314,7 @@ obj/structure/elite_tumor/proc/onEliteWon()
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
-
+
/obj/item/tumor_shard/afterattack(atom/target, mob/user, proximity_flag)
. = ..()
if(istype(target, /mob/living/simple_animal/hostile/asteroid/elite) && proximity_flag)
@@ -331,10 +332,11 @@ obj/structure/elite_tumor/proc/onEliteWon()
E.health = E.maxHealth
E.desc = "[E.desc] However, this one appears appears less wild in nature, and calmer around people."
E.sentience_type = SENTIENCE_ORGANIC
+ E.owner = user
qdel(src)
else
to_chat(user, "[src] only works on the corpse of a sentient lavaland elite.")
-
+
/obj/effect/temp_visual/elite_tumor_wall
name = "magic wall"
icon = 'icons/turf/walls/hierophant_wall_temp.dmi'
@@ -347,7 +349,7 @@ obj/structure/elite_tumor/proc/onEliteWon()
color = rgb(255,0,0)
light_range = MINIMUM_USEFUL_LIGHT_RANGE
light_color = LIGHT_COLOR_RED
-
+
/obj/effect/temp_visual/elite_tumor_wall/Initialize(mapload, new_caster)
. = ..()
queue_smooth_neighbors(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
index 540470d505..e65c4f5b20 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
@@ -44,34 +44,34 @@
/datum/action/innate/elite_attack/magic_box,
/datum/action/innate/elite_attack/pandora_teleport,
/datum/action/innate/elite_attack/aoe_squares)
-
+
var/sing_shot_length = 8
var/cooldown_time = 20
-
+
/datum/action/innate/elite_attack/singular_shot
name = "Singular Shot"
button_icon_state = "singular_shot"
chosen_message = "You are now creating a single linear magic square."
chosen_attack_num = SINGULAR_SHOT
-
+
/datum/action/innate/elite_attack/magic_box
name = "Magic Box"
button_icon_state = "magic_box"
chosen_message = "You are now attacking with a box of magic squares."
chosen_attack_num = MAGIC_BOX
-
+
/datum/action/innate/elite_attack/pandora_teleport
name = "Line Teleport"
button_icon_state = "pandora_teleport"
chosen_message = "You will now teleport to your target."
chosen_attack_num = PANDORA_TELEPORT
-
+
/datum/action/innate/elite_attack/aoe_squares
name = "AOE Blast"
button_icon_state = "aoe_squares"
chosen_message = "Your attacks will spawn an AOE blast at your target location."
chosen_attack_num = AOE_SQUARES
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/OpenFire()
if(client)
switch(chosen_attack)
@@ -94,7 +94,7 @@
pandora_teleport(target)
if(AOE_SQUARES)
aoe_squares(target)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/Life()
. = ..()
if(health >= maxHealth * 0.5)
@@ -105,28 +105,28 @@
return
else
cooldown_time = 10
-
-/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/singular_shot(target)
+
+/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/singular_shot(target)
ranged_cooldown = world.time + (cooldown_time * 0.5)
var/dir_to_target = get_dir(get_turf(src), get_turf(target))
var/turf/T = get_step(get_turf(src), dir_to_target)
singular_shot_line(sing_shot_length, dir_to_target, T)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/singular_shot_line(var/procsleft, var/angleused, var/turf/T)
if(procsleft <= 0)
return
- new /obj/effect/temp_visual/hierophant/blast/pandora(T, src)
+ new /obj/effect/temp_visual/hierophant/blast/pandora(T, src, null, null, list(owner))
T = get_step(T, angleused)
procsleft = procsleft - 1
addtimer(CALLBACK(src, .proc/singular_shot_line, procsleft, angleused, T), 2)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/magic_box(target)
ranged_cooldown = world.time + cooldown_time
var/turf/T = get_turf(target)
for(var/t in spiral_range_turfs(3, T))
if(get_dist(t, T) > 1)
- new /obj/effect/temp_visual/hierophant/blast/pandora(t, src)
-
+ new /obj/effect/temp_visual/hierophant/blast/pandora(t, src, null, null, list(owner))
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport(target)
ranged_cooldown = world.time + cooldown_time
var/turf/T = get_turf(target)
@@ -135,45 +135,45 @@
new /obj/effect/temp_visual/hierophant/telegraph(source, src)
playsound(source,'sound/machines/airlockopen.ogg', 200, 1)
addtimer(CALLBACK(src, .proc/pandora_teleport_2, T, source), 2)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_2(var/turf/T, var/turf/source)
new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, src)
new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, src)
for(var/t in RANGE_TURFS(1, T))
- new /obj/effect/temp_visual/hierophant/blast/pandora(t, src)
+ new /obj/effect/temp_visual/hierophant/blast/pandora(t, src, null, null, list(owner))
for(var/t in RANGE_TURFS(1, source))
- new /obj/effect/temp_visual/hierophant/blast/pandora(t, src)
+ new /obj/effect/temp_visual/hierophant/blast/pandora(t, src, null, null, list(owner))
animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out
visible_message("[src] fades out!")
density = FALSE
addtimer(CALLBACK(src, .proc/pandora_teleport_3, T), 2)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_3(var/turf/T)
forceMove(T)
animate(src, alpha = 255, time = 2, easing = EASE_IN) //fade IN
density = TRUE
visible_message("[src] fades in!")
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/aoe_squares(target)
ranged_cooldown = world.time + cooldown_time
var/turf/T = get_turf(target)
- new /obj/effect/temp_visual/hierophant/blast/pandora(T, src)
+ new /obj/effect/temp_visual/hierophant/blast/pandora(T, src, null, null, list(owner))
var/max_size = 2
addtimer(CALLBACK(src, .proc/aoe_squares_2, T, 0, max_size), 2)
-
+
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/aoe_squares_2(var/turf/T, var/ring, var/max_size)
if(ring > max_size)
return
for(var/t in spiral_range_turfs(ring, T))
if(get_dist(t, T) == ring)
- new /obj/effect/temp_visual/hierophant/blast/pandora(t, src)
+ new /obj/effect/temp_visual/hierophant/blast/pandora(t, src, null, null, list(owner))
addtimer(CALLBACK(src, .proc/aoe_squares_2, T, (ring + 1), max_size), 2)
-
+
//The specific version of hiero's squares pandora uses
/obj/effect/temp_visual/hierophant/blast/pandora
damage = 20
monster_damage_boost = FALSE
-
+
//Pandora's loot: Hope
/obj/item/clothing/accessory/pandora_hope
name = "Hope"
@@ -181,7 +181,7 @@
icon = 'icons/obj/lavaland/elite_trophies.dmi'
icon_state = "hope"
resistance_flags = FIRE_PROOF
-
+
/obj/item/clothing/accessory/pandora_hope/on_uniform_equip(obj/item/clothing/under/U, user)
var/mob/living/L = user
if(L && L.mind)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
index 05dec578bd..03d2365016 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/mining_mobs.dm
@@ -20,7 +20,7 @@
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
mob_size = MOB_SIZE_LARGE
var/icon_aggro = null
- var/crusher_drop_mod = 5
+ var/crusher_drop_mod = 25
/mob/living/simple_animal/hostile/asteroid/Initialize(mapload)
. = ..()
@@ -58,7 +58,7 @@
/mob/living/simple_animal/hostile/asteroid/death(gibbed)
SSblackbox.record_feedback("tally", "mobs_killed_mining", 1, type)
var/datum/status_effect/crusher_damage/C = has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
- if(C && crusher_loot && prob((C.total_damage/maxHealth) * crusher_drop_mod)) //on average, you'll need to kill 20 creatures before getting the item
+ if(C && crusher_loot && prob((C.total_damage/maxHealth) * crusher_drop_mod)) //on average, you'll need to kill 4 creatures before getting the item
spawn_crusher_loot()
..(gibbed)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm
index e3c81b2639..27ebb71c0e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/necropolis_tendril.dm
@@ -91,5 +91,5 @@
visible_message("The tendril falls inward, the ground around it widening into a yawning chasm!")
for(var/turf/T in range(2,src))
if(!T.density)
- T.TerraformTurf(/turf/open/chasm/lavaland, /turf/open/chasm/lavaland)
+ T.TerraformTurf(/turf/open/chasm/lavaland, /turf/open/chasm/lavaland, flags = CHANGETURF_INHERIT_AIR)
qdel(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 514edf896b..a5e3cd8120 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -166,7 +166,9 @@
..()
/mob/living/simple_animal/hostile/mushroom/attack_hand(mob/living/carbon/human/M)
- ..()
+ . = ..()
+ if(.) // the attack was blocked
+ return
if(M.a_intent == INTENT_HARM)
Bruise()
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index d1e10ea693..439ea5b2bf 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -253,33 +253,34 @@
return
/mob/living/simple_animal/slime/attack_slime(mob/living/simple_animal/slime/M)
- if(..()) //successful slime attack
- if(M == src)
- return
- if(buckled)
- Feedstop(silent = TRUE)
- visible_message("[M] pulls [src] off!")
- return
- attacked += 5
- if(nutrition >= 100) //steal some nutrition. negval handled in life()
- nutrition -= (50 + (40 * M.is_adult))
- M.add_nutrition(50 + (40 * M.is_adult))
- if(health > 0)
- M.adjustBruteLoss(-10 + (-10 * M.is_adult))
- M.updatehealth()
+ . = ..()
+ if(!. || M == src) //unsuccessful slime shock
+ return
+ if(buckled)
+ Feedstop(silent = TRUE)
+ visible_message("[M] pulls [src] off!")
+ return
+ attacked += 5
+ if(nutrition >= 100) //steal some nutrition. negval handled in life()
+ nutrition -= (50 + (40 * M.is_adult))
+ M.add_nutrition(50 + (40 * M.is_adult))
+ if(health > 0)
+ M.adjustBruteLoss(-10 + (-10 * M.is_adult))
+ M.updatehealth()
/mob/living/simple_animal/slime/attack_animal(mob/living/simple_animal/M)
. = ..()
if(.)
attacked += 10
-
/mob/living/simple_animal/slime/attack_paw(mob/living/carbon/monkey/M)
- if(..()) //successful monkey bite.
+ . = ..()
+ if(.)//successful monkey bite.
attacked += 10
/mob/living/simple_animal/slime/attack_larva(mob/living/carbon/alien/larva/L)
- if(..()) //successful larva bite.
+ . = ..()
+ if(.) //successful larva bite.
attacked += 10
/mob/living/simple_animal/slime/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
@@ -321,9 +322,11 @@
attacked += 10
/mob/living/simple_animal/slime/attack_alien(mob/living/carbon/alien/humanoid/M)
- if(..()) //if harm or disarm intent.
- attacked += 10
- discipline_slime(M)
+ . = ..()
+ if(!.) // the attack was blocked or was help/grab intent
+ return
+ attacked += 10
+ discipline_slime(M)
/mob/living/simple_animal/slime/attackby(obj/item/W, mob/living/user, params)
diff --git a/code/modules/mob/living/update_icons.dm b/code/modules/mob/living/update_icons.dm
new file mode 100644
index 0000000000..8bf0dc98a9
--- /dev/null
+++ b/code/modules/mob/living/update_icons.dm
@@ -0,0 +1,26 @@
+//IMPORTANT: Multiple animate() calls do not stack well, so try to do them all at once if you can.
+/mob/living/update_transform()
+ var/matrix/ntransform = matrix(transform) //aka transform.Copy()
+ var/final_pixel_y = pixel_y
+ var/final_dir = dir
+ var/changed = 0
+ if(lying != lying_prev && rotate_on_lying)
+ changed++
+ ntransform.TurnTo(lying_prev,lying)
+ if(lying == 0) //Lying to standing
+ final_pixel_y = get_standard_pixel_y_offset()
+ else //if(lying != 0)
+ if(lying_prev == 0) //Standing to lying
+ pixel_y = get_standard_pixel_y_offset()
+ final_pixel_y = get_standard_pixel_y_offset(lying)
+ if(dir & (EAST|WEST)) //Facing east or west
+ final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass
+
+ if(resize != RESIZE_DEFAULT_SIZE)
+ changed++
+ ntransform.Scale(resize)
+ resize = RESIZE_DEFAULT_SIZE
+
+ if(changed)
+ animate(src, transform = ntransform, time = 2, pixel_y = final_pixel_y, dir = final_dir, easing = EASE_IN|EASE_OUT)
+ setMovetype(movement_type & ~FLOATING) // If we were without gravity, the bouncing animation got stopped, so we make sure we restart it in next life().
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 1a3f2fca3b..b4c3c93824 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -459,6 +459,11 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA
if(!ckey || !new_mob)
CRASH("transfer_ckey() called [ckey ? "" : "on a ckey-less mob[new_mob ? "" : " and "]"][new_mob ? "" : "without a valid mob target"]!")
SEND_SIGNAL(new_mob, COMSIG_MOB_PRE_PLAYER_CHANGE, new_mob, src)
+ if (client && client.prefs && client.prefs.auto_ooc)
+ if (client.prefs.chat_toggles & CHAT_OOC && isliving(new_mob))
+ client.prefs.chat_toggles ^= CHAT_OOC
+ if (!(client.prefs.chat_toggles & CHAT_OOC) && isdead(new_mob))
+ client.prefs.chat_toggles ^= CHAT_OOC
new_mob.ckey = ckey
if(send_signal)
SEND_SIGNAL(src, COMSIG_MOB_KEY_CHANGE, new_mob, src)
@@ -562,9 +567,9 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
/mob/proc/is_muzzled()
return 0
-/mob/Stat(delayoverride)
- . = ..()
- var/statdelay = delayoverride || 10
+/mob/Stat()
+ ..()
+
if(statpanel("Status"))
if (client)
stat(null, "Ping: [round(client.lastping, 1)]ms (Average: [round(client.avgping, 1)]ms)")
@@ -572,7 +577,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
var/datum/map_config/cached = SSmapping.next_map_config
if(cached)
stat(null, "Next Map: [cached.map_name]")
- stat(null, "Round ID: [GLOB.round_id || "NULL"]")
+ stat(null, "Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]")
stat(null, "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]")
stat(null, "Round Time: [WORLDTIME2TEXT("hh:mm:ss")]")
stat(null, "Station Time: [STATION_TIME_TIMESTAMP("hh:mm:ss")]")
@@ -582,9 +587,8 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
if(ETA)
stat(null, "[ETA] [SSshuttle.emergency.getTimerStr()]")
- if(client?.holder)
+ if(client && client.holder)
if(statpanel("MC"))
- statdelay = 0 //It's assumed that if you're doing this you are doing debug stuff, don't do ioditic things.
var/turf/T = get_turf(client.eye)
stat("Location:", COORD(T))
stat("CPU:", "[world.cpu]")
@@ -610,7 +614,6 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
GLOB.ahelp_tickets.stat_entry()
if(length(GLOB.sdql2_queries))
if(statpanel("SDQL2"))
- statdelay = 0 //It's assumed that if you're doing this you are doing debug stuff, don't do ioditic things.
stat("Access Global SDQL2 List", GLOB.sdql2_vv_statobj)
for(var/i in GLOB.sdql2_queries)
var/datum/SDQL2_query/Q = i
@@ -634,13 +637,14 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
if(A.IsObscured())
continue
statpanel(listed_turf.name, null, A)
+
+
if(mind)
add_spells_to_statpanel(mind.spell_list)
var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
if(changeling)
add_stings_to_statpanel(changeling.purchasedpowers)
add_spells_to_statpanel(mob_spell_list)
- sleep(statdelay)
/mob/proc/add_spells_to_statpanel(list/spells)
for(var/obj/effect/proc_holder/spell/S in spells)
@@ -797,11 +801,14 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
//can the mob be buckled to something by default?
/mob/proc/can_buckle()
- return 1
+ return TRUE
//can the mob be unbuckled from something by default?
/mob/proc/can_unbuckle()
- return 1
+ return TRUE
+
+/mob/proc/can_buckle_others(mob/living/target, atom/buckle_to)
+ return TRUE
//Can the mob interact() with an atom?
/mob/proc/can_interact_with(atom/A)
@@ -953,4 +960,4 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
/mob/setMovetype(newval)
. = ..()
- update_movespeed(FALSE)
+ update_movespeed(FALSE)
\ No newline at end of file
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
index 8c304d8a2b..56c50078c1 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stealth.dm
@@ -26,10 +26,9 @@ Contents:
/obj/item/clothing/suit/space/space_ninja/proc/enable_signals()
if(!affecting)
return
- RegisterSignal(affecting, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_MOB_ATTACK_RANGED, COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_THROW, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_TELEPORTED, COMSIG_LIVING_GUN_PROCESS_FIRE), .proc/reduce_stealth)
+ RegisterSignal(affecting, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_MOB_ATTACK_RANGED, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_THROW, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_TELEPORTED, COMSIG_LIVING_GUN_PROCESS_FIRE), .proc/reduce_stealth)
RegisterSignal(affecting, COMSIG_MOVABLE_BUMP, .proc/bumping_stealth)
-
/obj/item/clothing/suit/space/space_ninja/proc/reduce_stealth(datum/source)
affecting.alpha = min(affecting.alpha + 40, 100)
@@ -42,7 +41,7 @@ Contents:
return FALSE
stealth = !stealth
stealth_cooldown = world.time + 5 SECONDS
- UnregisterSignal(affecting, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_MOB_ATTACK_RANGED, COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_THROW, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_TELEPORTED, COMSIG_LIVING_GUN_PROCESS_FIRE))
+ UnregisterSignal(affecting, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_MOB_ATTACK_RANGED, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_THROW, COMSIG_PARENT_ATTACKBY, COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_TELEPORTED, COMSIG_LIVING_GUN_PROCESS_FIRE))
animate(affecting, alpha = 255, time = 3 SECONDS)
affecting.visible_message("[affecting.name] appears from thin air!", \
"You are now visible.")
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index 2ca6ce2611..f3f7e45378 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -102,7 +102,7 @@
/obj/item/paperplane/throw_impact(atom/hit_atom)
if(iscarbon(hit_atom))
var/mob/living/carbon/C = hit_atom
- if(C.can_catch_item(TRUE))
+ if(!C.get_active_held_item() && !C.restrained())
var/datum/action/innate/origami/origami_action = locate() in C.actions
if(origami_action?.active) //if they're a master of origami and have the ability turned on, force throwmode on so they'll automatically catch the plane.
C.throw_mode_on()
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index fcc2c6c144..8e121dc809 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -65,7 +65,7 @@
if(delta_temperature > 0 && cold_air_heat_capacity > 0 && hot_air_heat_capacity > 0)
- var/efficiency = 0.00025 + (hot_air.reaction_results["fire"]*0.01)
+ var/efficiency = 0.45
var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity)
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 531c6082b0..19fdfd2b7e 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -37,6 +37,7 @@
var/burst_spread = 0 //Spread induced by the gun itself during burst fire per iteration. Only checked if spread is 0.
var/randomspread = 1 //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
var/inaccuracy_modifier = 1
+ var/pb_knockback = 0
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
@@ -125,6 +126,10 @@
if(message)
if(pointblank)
user.visible_message("[user] fires [src] point blank at [pbtarget]!", null, null, COMBAT_MESSAGE_RANGE)
+ if(pb_knockback > 0)
+ var/atom/throw_target = get_edge_target_turf(pbtarget, user.dir)
+ pbtarget.throw_at(throw_target, pb_knockback, 2)
+
else
user.visible_message("[user] fires [src]!", null, null, COMBAT_MESSAGE_RANGE)
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index bcb212a031..7fb4a8232e 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -267,6 +267,7 @@
fire_delay = 0
pin = /obj/item/firing_pin/implant/pindicate
actions_types = list()
+ pb_knockback = 2
/obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted
pin = /obj/item/firing_pin
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index d1a5f12888..31a5131804 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -273,6 +273,7 @@
"Maple" = "dshotgun-l",
"Rosewood" = "dshotgun-p"
)
+ pb_knockback = 3 // it's a super shotgun!
/obj/item/gun/ballistic/revolver/doublebarrel/attackby(obj/item/A, mob/user, params)
..()
@@ -352,7 +353,7 @@
clumsy_check = 0
/obj/item/gun/ballistic/revolver/reverse/can_trigger_gun(mob/living/user)
- if((HAS_TRAIT(user, TRAIT_CLUMSY)) || (user.mind && user.mind.assigned_role == "Clown"))
+ if((HAS_TRAIT(user, TRAIT_CLUMSY)) || (user.mind && HAS_TRAIT(user.mind, TRAIT_CLOWN_MENTALITY)))
return ..()
if(process_fire(user, user, FALSE, null, BODY_ZONE_HEAD))
user.visible_message("[user] somehow manages to shoot [user.p_them()]self in the face!", "You somehow shoot yourself in the face! How the hell?!")
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 571525d8f0..deec187f88 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -12,6 +12,8 @@
var/recentpump = 0 // to prevent spammage
weapon_weight = WEAPON_MEDIUM
+ pb_knockback = 2
+
/obj/item/gun/ballistic/shotgun/attackby(obj/item/A, mob/user, params)
. = ..()
if(.)
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index 8b358832b0..8f9bc13583 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -56,6 +56,7 @@
item_flags = NONE
casing_ejector = FALSE
can_suppress = FALSE
+ pb_knockback = 0
/obj/item/gun/ballistic/shotgun/toy/process_chamber(empty_chamber = 0)
..()
diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm
index 1e2070de1b..0465a611cd 100644
--- a/code/modules/projectiles/pins.dm
+++ b/code/modules/projectiles/pins.dm
@@ -135,7 +135,7 @@
// A gun with ultra-honk pin is useful for clown and useless for everyone else.
/obj/item/firing_pin/clown/ultra/pin_auth(mob/living/user)
playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
- if(user && (!(HAS_TRAIT(user, TRAIT_CLUMSY)) && !(user.mind && user.mind.assigned_role == "Clown")))
+ if(user && (!(HAS_TRAIT(user, TRAIT_CLUMSY)) && !(user.mind && HAS_TRAIT(user.mind, TRAIT_CLOWN_MENTALITY))))
return FALSE
return TRUE
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 173d9721a9..791db320a2 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -93,7 +93,7 @@
/obj/item/projectile/magic/door/proc/CreateDoor(turf/T)
var/door_type = pick(door_types)
var/obj/structure/mineral_door/D = new door_type(T)
- T.ChangeTurf(/turf/open/floor/plating)
+ T.ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
D.Open()
/obj/item/projectile/magic/door/proc/OpenDoor(var/obj/machinery/door/D)
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 1ac62ba651..513626465a 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -260,7 +260,7 @@
if(!amount)
return
vol_each = min(reagents.total_volume / amount, 50)
- var/name = stripped_input(usr,"Name:","Name your pill!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN)
+ var/name = html_decode(stripped_input(usr,"Name:","Name your pill!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN))
if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
return
var/obj/item/reagent_containers/pill/P
@@ -287,7 +287,7 @@
adjust_item_drop_location(P)
reagents.trans_to(P,vol_each)
else
- var/name = stripped_input(usr, "Name:", "Name your pack!", reagents.get_master_reagent_name(), MAX_NAME_LEN)
+ var/name = html_decode(stripped_input(usr, "Name:", "Name your pack!", reagents.get_master_reagent_name(), MAX_NAME_LEN))
if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
return
var/obj/item/reagent_containers/food/condiment/pack/P = new/obj/item/reagent_containers/food/condiment/pack(drop_location())
@@ -313,7 +313,7 @@
if(!amount)
return
vol_each = min(reagents.total_volume / amount, 40)
- var/name = stripped_input(usr,"Name:","Name your patch!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN)
+ var/name = html_decode(stripped_input(usr,"Name:","Name your patch!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN))
if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
return
var/obj/item/reagent_containers/pill/P
@@ -331,7 +331,7 @@
return
if(condi)
- var/name = stripped_input(usr, "Name:","Name your bottle!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN)
+ var/name = html_decode(stripped_input(usr, "Name:","Name your bottle!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN))
if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
return
var/obj/item/reagent_containers/food/condiment/P = new(drop_location())
@@ -344,7 +344,7 @@
if(text2num(many))
amount_full = round(reagents.total_volume / 30)
vol_part = ((reagents.total_volume*1000) % 30000) / 1000 //% operator doesn't support decimals.
- var/name = stripped_input(usr, "Name:","Name your bottle!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN)
+ var/name = html_decode(stripped_input(usr, "Name:","Name your bottle!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN))
if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
return
@@ -372,7 +372,7 @@
if(text2num(many))
amount_full = round(reagents.total_volume / 60)
vol_part = reagents.total_volume % 60
- var/name = stripped_input(usr, "Name:","Name your hypovial!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN)
+ var/name = html_decode(stripped_input(usr, "Name:","Name your hypovial!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN))
if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
return
@@ -407,7 +407,7 @@
return
vol_each = min(reagents.total_volume / amount, 20)
- var/name = stripped_input(usr,"Name:","Name your SmartDart!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN)
+ var/name = html_decode(stripped_input(usr,"Name:","Name your SmartDart!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN))
if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
return
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index fd28ff9c47..077ab1fb7a 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -36,7 +36,9 @@ All effects don't start immediately, but rather get worse over time; the rate is
*/
/datum/reagent/consumable/ethanol/on_mob_life(mob/living/carbon/C)
- if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
+ if(HAS_TRAIT(C, TRAIT_NO_ALCOHOL))
+ C.adjustToxLoss((boozepwr/25)*REM,forced = TRUE)
+ else if(C.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
var/booze_power = boozepwr
if(HAS_TRAIT(C, TRAIT_ALCOHOL_TOLERANCE)) //we're an accomplished drinker
booze_power *= 0.7
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 5d31bfae9b..e8551074e7 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -247,6 +247,23 @@
. = 1
..()
+/datum/reagent/consumable/coconutmilk
+ name = "Coconut Milk"
+ id = "coconutmilk"
+ description = "A transparent white liquid extracted from coconuts. Rich in taste."
+ color = "#DFDFDF" // rgb: 223, 223, 223
+ taste_description = "sweet milk"
+ quality = DRINK_GOOD
+ glass_icon_state = "glass_white"
+ glass_name = "glass of coconut milk"
+ glass_desc = "White and nutritious goodness!"
+
+/datum/reagent/consumable/coconutmilk/on_mob_life(mob/living/carbon/M)
+ if(M.getBruteLoss() && prob(20))
+ M.heal_bodypart_damage(2,0, 0)
+ . = 1
+ ..()
+
/datum/reagent/consumable/cream
name = "Cream"
id = "cream"
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 23eb24ed15..64e693a326 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -622,7 +622,7 @@
M.adjustBruteLoss(-1*REM, 0)
M.adjustFireLoss(-1*REM, 0)
M.adjustOxyLoss(-1*REM, 0)
- M.adjustToxLoss(-1*REM, 0)
+ M.adjustToxLoss(-1*REM, 0, TRUE) //heals TOXINLOVERs
..()
/datum/reagent/consumable/honey/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 512b8a21a1..bd6eb4244c 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -1870,133 +1870,82 @@
reagent_state = LIQUID
color = "#b51d05"
taste_description = "carpet" // Your tounge feels furry.
+ var/carpet_type = /turf/open/floor/carpet
/datum/reagent/carpet/reaction_turf(turf/T, reac_volume)
if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
var/turf/open/floor/F = T
- F.PlaceOnTop(/turf/open/floor/carpet)
+ F.PlaceOnTop(carpet_type, flags = CHANGETURF_INHERIT_AIR)
..()
/datum/reagent/carpet/black
name = "Liquid Black Carpet"
id = "blackcarpet"
color = "#363636"
-
-/datum/reagent/carpet/black/reaction_turf(turf/T, reac_volume)
- if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
- var/turf/open/floor/F = T
- F.PlaceOnTop(/turf/open/floor/carpet/black)
- ..()
+ carpet_type = /turf/open/floor/carpet/black
/datum/reagent/carpet/blackred
name = "Liquid Red Black Carpet"
id = "blackredcarpet"
color = "#342125"
-
-/datum/reagent/carpet/blackred/reaction_turf(turf/T, reac_volume)
- if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
- var/turf/open/floor/F = T
- F.PlaceOnTop(/turf/open/floor/carpet/blackred)
- ..()
+ carpet_type = /turf/open/floor/carpet/blackred
/datum/reagent/carpet/monochrome
name = "Liquid Monochrome Carpet"
id = "monochromecarpet"
color = "#b4b4b4"
-
-/datum/reagent/carpet/monochrome/reaction_turf(turf/T, reac_volume)
- if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
- var/turf/open/floor/F = T
- F.PlaceOnTop(/turf/open/floor/carpet/monochrome)
- ..()
+ carpet_type = /turf/open/floor/carpet/monochrome
/datum/reagent/carpet/blue
name = "Liquid Blue Carpet"
id = "bluecarpet"
color = "#1256ff"
-
-/datum/reagent/carpet/blue/reaction_turf(turf/T, reac_volume)
- if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
- var/turf/open/floor/F = T
- F.PlaceOnTop(/turf/open/floor/carpet/blue)
- ..()
+ carpet_type = /turf/open/floor/carpet/blue
/datum/reagent/carpet/cyan
name = "Liquid Cyan Carpet"
id = "cyancarpet"
color = "#3acfb9"
-
-/datum/reagent/carpet/cyan/reaction_turf(turf/T, reac_volume)
- if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
- var/turf/open/floor/F = T
- F.PlaceOnTop(/turf/open/floor/carpet/cyan)
- ..()
+ carpet_type = /turf/open/floor/carpet/cyan
/datum/reagent/carpet/green
name = "Liquid Green Carpet"
id = "greencarpet"
color = "#619b62"
-
-/datum/reagent/carpet/green/reaction_turf(turf/T, reac_volume)
- if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
- var/turf/open/floor/F = T
- F.PlaceOnTop(/turf/open/floor/carpet/green)
- ..()
+ carpet_type = /turf/open/floor/carpet/green
/datum/reagent/carpet/orange
name = "Liquid Orange Carpet"
id = "orangecarpet"
color = "#cc7900"
-
-/datum/reagent/carpet/orange/reaction_turf(turf/T, reac_volume)
- if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
- var/turf/open/floor/F = T
- F.PlaceOnTop(/turf/open/floor/carpet/orange)
- ..()
+ carpet_type = /turf/open/floor/carpet/orange
/datum/reagent/carpet/purple
name = "Liquid Purple Carpet"
id = "purplecarpet"
color = "#6d3392"
+ carpet_type = /turf/open/floor/carpet/purple
-/datum/reagent/carpet/purple/reaction_turf(turf/T, reac_volume)
- if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
- var/turf/open/floor/F = T
- F.PlaceOnTop(/turf/open/floor/carpet/purple)
- ..()
/datum/reagent/carpet/red
name = "Liquid Red Carpet"
id = "redcarpet"
color = "#871515"
+ carpet_type = /turf/open/floor/carpet/red
-/datum/reagent/carpet/red/reaction_turf(turf/T, reac_volume)
- if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
- var/turf/open/floor/F = T
- F.PlaceOnTop(/turf/open/floor/carpet/red)
- ..()
/datum/reagent/carpet/royalblack
name = "Liquid Royal Black Carpet"
id = "royalblackcarpet"
color = "#483d05"
+ carpet_type = /turf/open/floor/carpet/royalblack
-/datum/reagent/carpet/royalblack/reaction_turf(turf/T, reac_volume)
- if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
- var/turf/open/floor/F = T
- F.PlaceOnTop(/turf/open/floor/carpet/royalblack)
- ..()
/datum/reagent/carpet/royalblue
name = "Liquid Royal Blue Carpet"
id = "royalbluecarpet"
color = "#24227e"
-
-/datum/reagent/carpet/royalblue/reaction_turf(turf/T, reac_volume)
- if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
- var/turf/open/floor/F = T
- F.PlaceOnTop(/turf/open/floor/carpet/royalblue)
- ..()
+ carpet_type = /turf/open/floor/carpet/royalblue
// Virology virus food chems.
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index c170858d98..36621aa662 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -53,7 +53,7 @@
if(isplatingturf(T))
var/turf/open/floor/plating/F = T
if(prob(10 + F.burnt + 5*F.broken)) //broken or burnt plating is more susceptible to being destroyed
- F.ScrapeAway()
+ F.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
if(isfloorturf(T))
var/turf/open/floor/F = T
if(prob(reac_volume))
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index eaae548d68..ad349ea926 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -142,9 +142,9 @@
/datum/chemical_reaction/fermis_plush
name = "Fermis plush"
id = "fermis_plush"
- required_reagents = list("sugar" = 10, "blood" = 10, "stable_plasma" = 10)
+ required_reagents = list("caramel" = 10, "blood" = 10, "stable_plasma" = 10)
mob_react = FALSE
- required_temp = 400
+ required_temp = 300
/datum/chemical_reaction/fermis_plush/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
diff --git a/code/modules/reagents/chemistry/recipes/special.dm b/code/modules/reagents/chemistry/recipes/special.dm
index 59394e6e4b..08d07b8a52 100644
--- a/code/modules/reagents/chemistry/recipes/special.dm
+++ b/code/modules/reagents/chemistry/recipes/special.dm
@@ -123,24 +123,11 @@ GLOBAL_LIST_INIT(food_reagents, build_reagents_to_food()) //reagentid = related
/datum/chemical_reaction/randomized/proc/LoadOldRecipe(recipe_data)
created = text2num(recipe_data["timestamp"])
-
- var/req_reag = unwrap_reagent_list(recipe_data["required_reagents"])
- if(!req_reag)
- return FALSE
- required_reagents = req_reag
-
- var/req_catalysts = unwrap_reagent_list(recipe_data["required_catalysts"])
- if(!req_catalysts)
- return FALSE
- required_catalysts = req_catalysts
-
+ required_reagents = SANITIZE_LIST(recipe_data["required_reagents"])
+ required_catalysts = SANITIZE_LIST(recipe_data["required_catalysts"])
required_temp = recipe_data["required_temp"]
is_cold_recipe = recipe_data["is_cold_recipe"]
-
- var/temp_results = unwrap_reagent_list(recipe_data["results"])
- if(!temp_results)
- return FALSE
- results = temp_results
+ results = SANITIZE_LIST(recipe_data["results"])
var/containerpath = text2path(recipe_data["required_container"])
if(!containerpath)
return FALSE
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 618b74fffb..b31b5c600d 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -19,18 +19,38 @@
var/container_HP = 2
var/cached_icon
+/obj/item/reagent_containers/verb/set_APTFT(mob/user) //set amount_per_transfer_from_this
+ set name = "Set Transfer Amount"
+ set category = "Object"
+ var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
+ if(N)
+ amount_per_transfer_from_this = N
+ to_chat(user, "[src]'s transfer amount is now [amount_per_transfer_from_this] units.")
+
/obj/item/reagent_containers/Initialize(mapload, vol)
. = ..()
if(isnum(vol) && vol > 0)
volume = vol
+ if(!possible_transfer_amounts)
+ src.verbs -= /obj/item/reagent_containers/verb/set_APTFT
create_reagents(volume, reagent_flags)
if(spawned_disease)
var/datum/disease/F = new spawned_disease()
var/list/data = list("blood_DNA" = "UNKNOWN DNA", "blood_type" = "SY","viruses"= list(F))
reagents.add_reagent("blood", disease_amount, data)
-
add_initial_reagents()
+/obj/item/reagent_containers/examine(mob/user)
+ . = ..()
+ . += "Currently transferring [amount_per_transfer_from_this] units per use."
+ if(possible_transfer_amounts && user.Adjacent(src))
+ . += "Alt-click it to set its transfer amount."
+
+/obj/item/reagent_containers/AltClick(mob/user)
+ . = ..()
+ if(possible_transfer_amounts && user.Adjacent(src))
+ set_APTFT()
+
/obj/item/reagent_containers/proc/add_initial_reagents()
if(list_reagents)
reagents.add_reagent_list(list_reagents)
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index 2bd5fb2d9f..94ad5fdb2c 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -26,12 +26,11 @@ Borg Hypospray
var/bypass_protection = 0 //If the hypospray can go through armor or thick material
var/list/datum/reagents/reagent_list = list()
- var/list/reagent_ids = list("dexalin", "kelotane", "bicaridine", "antitoxin", "epinephrine", "spaceacillin", "salglu_solution")
+ var/list/reagent_ids = list("dexalin", "kelotane", "bicaridine", "antitoxin", "epinephrine", "spaceacillin", "salglu_solution", "insulin")
var/accepts_reagent_upgrades = TRUE //If upgrades can increase number of reagents dispensed.
var/list/modes = list() //Basically the inverse of reagent_ids. Instead of having numbers as "keys" and strings as values it has strings as keys and numbers as values.
//Used as list for input() in shakers.
-
/obj/item/reagent_containers/borghypo/Initialize()
. = ..()
@@ -40,12 +39,10 @@ Borg Hypospray
START_PROCESSING(SSobj, src)
-
/obj/item/reagent_containers/borghypo/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
-
/obj/item/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg
charge_tick++
if(charge_tick >= recharge_time)
@@ -162,7 +159,7 @@ Borg Hypospray
icon_state = "borghypo_s"
charge_cost = 20
recharge_time = 2
- reagent_ids = list("syndicate_nanites", "potass_iodide", "morphine")
+ reagent_ids = list("syndicate_nanites", "potass_iodide", "morphine", "insulin")
bypass_protection = 1
accepts_reagent_upgrades = FALSE
@@ -178,7 +175,6 @@ Borg Shaker
charge_cost = 20 //Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster.
recharge_time = 3
accepts_reagent_upgrades = FALSE
-
reagent_ids = list("beer", "orangejuice", "grenadine", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale", "milk", "coffee", "banana", "lemonjuice")
/obj/item/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user)
@@ -234,23 +230,21 @@ Borg Shaker
charge_cost = 20 //Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster.
recharge_time = 3
accepts_reagent_upgrades = FALSE
-
reagent_ids = list("fakebeer", "fernet")
/obj/item/reagent_containers/borghypo/peace
name = "Peace Hypospray"
-
- reagent_ids = list("dizzysolution","tiresolution","synthpax")
+ reagent_ids = list("dizzysolution", "tiresolution", "synthpax", "insulin")
accepts_reagent_upgrades = FALSE
/obj/item/reagent_containers/borghypo/peace/hacked
desc = "Everything's peaceful in death!"
icon_state = "borghypo_s"
- reagent_ids = list("dizzysolution","tiresolution","synthpax","tirizene","sulfonal","sodium_thiopental","cyanide","fentanyl")
+ reagent_ids = list("dizzysolution", "tiresolution", "synthpax", "tirizene", "sulfonal", "sodium_thiopental", "cyanide", "fentanyl")
accepts_reagent_upgrades = FALSE
/obj/item/reagent_containers/borghypo/epi
- name = "epinephrine injector"
+ name = "Stabilizer injector"
desc = "An advanced chemical synthesizer and injection system, designed to stabilize patients."
- reagent_ids = list("epinephrine")
+ reagent_ids = list("epinephrine", "insulin")
accepts_reagent_upgrades = FALSE
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 3ed505c360..1b213fed0f 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -109,11 +109,13 @@
/obj/item/reagent_containers/glass/beaker
name = "beaker"
- desc = "A beaker. It can hold up to 50 units. Unable to withstand extreme pHes"
+ desc = "A beaker. It can hold up to 60 units. Unable to withstand extreme pHes."
icon = 'icons/obj/chemical.dmi'
+ volume = 60
icon_state = "beaker"
item_state = "beaker"
materials = list(MAT_GLASS=500)
+ possible_transfer_amounts = list(5,10,15,20,25,30,50,60)
beaker_weakness_bitflag = PH_WEAK
/obj/item/reagent_containers/glass/beaker/Initialize()
@@ -156,28 +158,28 @@
/obj/item/reagent_containers/glass/beaker/jar
name = "honey jar"
- desc = "A jar for honey. It can hold up to 50 units of sweet delight. Unable to withstand reagents of an extreme pH."
+ desc = "A jar for honey. It can hold up to 60 units of sweet delight. Unable to withstand reagents of an extreme pH."
icon = 'icons/obj/chemical.dmi'
icon_state = "vapour"
/obj/item/reagent_containers/glass/beaker/large
name = "large beaker"
- desc = "A large beaker. Can hold up to 100 units. Unable to withstand reagents of an extreme pH."
+ desc = "A large beaker. Can hold up to 120 units. Unable to withstand reagents of an extreme pH."
icon_state = "beakerlarge"
materials = list(MAT_GLASS=2500)
- volume = 100
+ volume = 120
amount_per_transfer_from_this = 10
- possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
+ possible_transfer_amounts = list(5,10,15,20,25,30,40,50,60,120)
container_HP = 3
/obj/item/reagent_containers/glass/beaker/plastic
name = "x-large beaker"
- desc = "An extra-large beaker. Can hold up to 150 units. Is able to resist acid and alkaline solutions, but melts at 444K"
+ desc = "An extra-large beaker. Can hold up to 180 units. Is able to resist acid and alkaline solutions, but melts at 444 K."
icon_state = "beakerwhite"
materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000)
- volume = 150
+ volume = 180
amount_per_transfer_from_this = 10
- possible_transfer_amounts = list(5,10,15,20,25,30,50,100,150)
+ possible_transfer_amounts = list(5,10,15,20,25,30,40,50,60,120,180)
/obj/item/reagent_containers/glass/beaker/plastic/Initialize()
beaker_weakness_bitflag &= ~PH_WEAK
@@ -191,14 +193,14 @@
/obj/item/reagent_containers/glass/beaker/meta
name = "metamaterial beaker"
- desc = "A large beaker. Can hold up to 200 units. Is able to withstand all chemical situations."
+ desc = "A large beaker. Can hold up to 240 units, and is able to withstand all chemical situations."
icon_state = "beakergold"
materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000, MAT_GOLD=1000, MAT_TITANIUM=1000)
- volume = 200
+ volume = 240
amount_per_transfer_from_this = 10
- possible_transfer_amounts = list(5,10,15,20,25,30,50,100,200)
+ possible_transfer_amounts = list(5,10,15,20,25,30,40,50,60,120,200,240)
-/obj/item/reagent_containers/glass/beaker/meta/Initialize()
+/obj/item/reagent_containers/glass/beaker/meta/Initialize() // why the fuck can't you just set the beaker weakness bitflags to nothing? fuck you
beaker_weakness_bitflag &= ~PH_WEAK
. = ..()
@@ -228,7 +230,7 @@
volume = 300
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
- container_HP = 4
+ container_HP = 5
/obj/item/reagent_containers/glass/beaker/cryoxadone
list_reagents = list("cryoxadone" = 30)
@@ -339,6 +341,7 @@
materials = list(MAT_GLASS=0)
volume = 50
amount_per_transfer_from_this = 10
+ possible_transfer_amounts = list(5,10,15,20,25,30,50)
container_HP = 1
/obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
@@ -355,6 +358,7 @@
list_reagents = list("water" = 100)
volume = 100
amount_per_transfer_from_this = 20
+ possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
container_HP = 1
/obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
diff --git a/code/modules/reagents/reagent_containers/hypovial.dm b/code/modules/reagents/reagent_containers/hypovial.dm
index ba5ce48a4a..1f83e895bb 100644
--- a/code/modules/reagents/reagent_containers/hypovial.dm
+++ b/code/modules/reagents/reagent_containers/hypovial.dm
@@ -1,6 +1,6 @@
//hypovials used with the MkII hypospray. See hypospray.dm.
-/obj/item/reagent_containers/glass/bottle/vial
+/obj/item/reagent_containers/glass/bottle/vial // these have literally no fucking right to just be better beakers that you can shit out of a chemmaster
name = "broken hypovial"
desc = "A hypovial compatible with most hyposprays."
icon_state = "hypovial"
@@ -27,6 +27,8 @@
for(var/R in comes_with)
reagents.add_reagent(R,comes_with[R])
update_icon()
+// beaker_weakness_bitflag |= PH_WEAK // fuck you if you're using these like beakers
+// beaker_weakness_bitflag |= TEMP_WEAK
/obj/item/reagent_containers/glass/bottle/vial/on_reagent_change()
@@ -60,11 +62,11 @@
/obj/item/reagent_containers/glass/bottle/vial/small
name = "hypovial"
volume = 60
- possible_transfer_amounts = list(5,10)
+ possible_transfer_amounts = list(1,2,5,10,20)
/obj/item/reagent_containers/glass/bottle/vial/small/bluespace
volume = 120
- possible_transfer_amounts = list(5,10)
+ possible_transfer_amounts = list(1,2,5,10,20)
name = "bluespace hypovial"
icon_state = "hypovialbs"
unique_reskin = null
@@ -74,7 +76,7 @@
desc = "A large hypovial, for deluxe hypospray models."
icon_state = "hypoviallarge"
volume = 120
- possible_transfer_amounts = list(5,10,15,20)
+ possible_transfer_amounts = list(1,2,5,10,20)
unique_reskin = list("large hypovial" = "hypoviallarge",
"large red hypovial" = "hypoviallarge-b",
"large blue hypovial" = "hypoviallarge-d",
@@ -106,7 +108,7 @@
add_overlay(filling)
/obj/item/reagent_containers/glass/bottle/vial/large/bluespace
- possible_transfer_amounts = list(5,10,15,20)
+ possible_transfer_amounts = list(1,2,5,10,20)
name = "bluespace large hypovial"
volume = 240
icon_state = "hypoviallargebs"
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 7701e58616..46ddb1e2ed 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/machinery/conveyor/inverted/Initialize(mapload)
. = ..()
if(mapload && !(dir in GLOB.diagonals))
- log_game("### MAPPING ERROR: [src] at [AREACOORD(src)] spawned without using a diagonal dir. Please replace with a normal version.")
+ log_mapping("[src] at [AREACOORD(src)] spawned without using a diagonal dir. Please replace with a normal version.")
// Auto conveyour is always on unless unpowered
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index 05e4c667f6..2be4d106b6 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -51,6 +51,22 @@
make_reagents = list()
category = list("initial","Food")
+/datum/design/enzyme
+ name = "10u Universal Enzyme"
+ id = "enzyme"
+ build_type = BIOGENERATOR
+ materials = list(MAT_BIOMASS = 30)
+ make_reagents = list("enzyme" = 10)
+ category = list("initial","Food")
+
+/datum/design/flour_sack
+ name = "Flour Sack"
+ id = "flour_sack"
+ build_type = BIOGENERATOR
+ materials = list(MAT_BIOMASS = 150)
+ build_path = /obj/item/reagent_containers/food/condiment/flour
+ category = list("initial","Food")
+
/datum/design/monkey_cube
name = "Monkey Cube"
id = "mcube"
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index e70362553c..f2ded3a57b 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -152,6 +152,16 @@
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+/datum/design/telescopiciv
+ name = "Telescopic IV Drip"
+ desc = "An IV drip with an advanced infusion pump that can both drain blood into and inject liquids from attached containers. Blood packs are processed at an accelerated rate. This one is telescopic, and can be picked up and put down."
+ id = "telescopiciv"
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 5000, MAT_GLASS = 3500, MAT_SILVER = 1000)
+ build_path = /obj/item/tele_iv
+ category = list("Medical Designs")
+ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
/datum/design/holobarrier_med
name = "PENLITE holobarrier projector"
desc = "PENLITE holobarriers, a device that halts individuals with malicious diseases."
diff --git a/code/modules/research/designs/nanite_designs.dm b/code/modules/research/designs/nanite_designs.dm
index 177d7073a1..09fe1d9c9b 100644
--- a/code/modules/research/designs/nanite_designs.dm
+++ b/code/modules/research/designs/nanite_designs.dm
@@ -25,6 +25,20 @@
program_type = /datum/nanite_program/viral
category = list("Utility Nanites")
+/datum/design/nanites/research
+ name = "Distributed Computing"
+ desc = "The nanites aid the research servers by performing a portion of its calculations, increasing research point generation."
+ id = "research_nanites"
+ program_type = /datum/nanite_program/research
+ category = list("Utility Nanites")
+
+/datum/design/nanites/researchplus
+ name = "Neural Network"
+ desc = "The nanites link the host's brains together forming a neural research network, that becomes more efficient with the amount of total hosts. Can be overloaded to increase research output."
+ id = "researchplus_nanites"
+ program_type = /datum/nanite_program/researchplus
+ category = list("Utility Nanites")
+
/datum/design/nanites/monitoring
name = "Monitoring"
desc = "The nanites monitor the host's vitals and location, sending them to the suit sensor network."
@@ -39,6 +53,13 @@
program_type = /datum/nanite_program/triggered/self_scan
category = list("Utility Nanites")
+/datum/design/nanites/dermal_button
+ name = "Dermal Button"
+ desc = "Displays a button on the host's skin, which can be used to send a signal to the nanites."
+ id = "dermal_button_nanites"
+ program_type = /datum/nanite_program/dermal_button
+ category = list("Utility Nanites")
+
/datum/design/nanites/stealth
name = "Stealth"
desc = "The nanites hide their activity and programming from superficial scans."
@@ -46,6 +67,15 @@
program_type = /datum/nanite_program/stealth
category = list("Utility Nanites")
+
+/datum/design/nanites/reduced_diagnostics
+ name = "Reduced Diagnostics"
+ desc = "Disables some high-cost diagnostics in the nanites, making them unable to communicate their program list to portable scanners. \
+ Doing so saves some power, slightly increasing their replication speed."
+ id = "red_diag_nanites"
+ program_type = /datum/nanite_program/reduced_diagnostics
+ category = list("Utility Nanites")
+
/datum/design/nanites/access
name = "Subdermal ID"
desc = "The nanites store the host's ID access rights in a subdermal magnetic strip. Updates when triggered, copying the host's current access."
diff --git a/code/modules/research/nanites/nanite_programs/utility.dm b/code/modules/research/nanites/nanite_programs/utility.dm
index a269d01ac0..3db482d989 100644
--- a/code/modules/research/nanites/nanite_programs/utility.dm
+++ b/code/modules/research/nanites/nanite_programs/utility.dm
@@ -130,7 +130,7 @@
/datum/nanite_program/stealth
name = "Stealth"
- desc = "The nanites hide their activity and programming from superficial scans."
+ desc = "The nanites mask their activity from superficial scans, becoming undetectable by HUDs and non-specialized scanners."
rogue_types = list(/datum/nanite_program/toxic)
use_rate = 0.2
@@ -142,6 +142,22 @@
. = ..()
nanites.stealth = FALSE
+/datum/nanite_program/reduced_diagnostics
+ name = "Reduced Diagnostics"
+ desc = "Disables some high-cost diagnostics in the nanites, making them unable to communicate their program list to portable scanners. \
+ Doing so saves some power, slightly increasing their replication speed."
+ rogue_types = list(/datum/nanite_program/toxic)
+ use_rate = -0.1
+
+/datum/nanite_program/reduced_diagnostics/enable_passive_effect()
+ . = ..()
+ nanites.diagnostics = FALSE
+
+/datum/nanite_program/reduced_diagnostics/disable_passive_effect()
+ . = ..()
+ nanites.diagnostics = TRUE
+
+
/datum/nanite_program/relay
name = "Relay"
desc = "The nanites receive and relay long-range nanite signals."
@@ -271,3 +287,138 @@
if(fault == src)
return
fault.software_error()
+
+/datum/nanite_program/dermal_button
+ name = "Dermal Button"
+ desc = "Displays a button on the host's skin, which can be used to send a signal to the nanites."
+ extra_settings = list("Sent Code","Button Name","Icon","Color")
+ unique = FALSE
+ var/datum/action/innate/nanite_button/button
+ var/button_name = "Button"
+ var/icon = "power"
+ var/color = "green"
+ var/sent_code = 0
+
+/datum/nanite_program/dermal_button/set_extra_setting(user, setting)
+ if(setting == "Sent Code")
+ var/new_code = input(user, "Set the sent code (1-9999):", name, null) as null|num
+ if(isnull(new_code))
+ return
+ sent_code = CLAMP(round(new_code, 1), 1, 9999)
+ if(setting == "Button Name")
+ var/new_button_name = stripped_input(user, "Choose the name for the button.", "Button Name", button_name, MAX_NAME_LEN)
+ if(!new_button_name)
+ return
+ button_name = new_button_name
+ if(setting == "Icon")
+ var/new_icon = input("Select the icon to display on the button:", name) as null|anything in list("one","two","three","four","five","plus","minus","power")
+ if(!new_icon)
+ return
+ icon = new_icon
+ if(setting == "Color")
+ var/new_color = input("Select the color of the button's icon:", name) as null|anything in list("green","red","yellow","blue")
+ if(!new_color)
+ return
+ color = new_color
+
+/datum/nanite_program/dermal_button/get_extra_setting(setting)
+ if(setting == "Sent Code")
+ return sent_code
+ if(setting == "Button Name")
+ return button_name
+ if(setting == "Icon")
+ return capitalize(icon)
+ if(setting == "Color")
+ return capitalize(color)
+
+/datum/nanite_program/dermal_button/copy_extra_settings_to(datum/nanite_program/dermal_button/target)
+ target.sent_code = sent_code
+ target.button_name = button_name
+ target.icon = icon
+ target.color = color
+
+/datum/nanite_program/dermal_button/enable_passive_effect()
+ . = ..()
+ if(!button)
+ button = new(src, button_name, icon, color)
+ button.target = host_mob
+ button.Grant(host_mob)
+
+/datum/nanite_program/dermal_button/disable_passive_effect()
+ . = ..()
+ if(button)
+ button.Remove(host_mob)
+
+/datum/nanite_program/dermal_button/on_mob_remove()
+ . = ..()
+ qdel(button)
+
+/datum/nanite_program/dermal_button/proc/press()
+ if(activated)
+ host_mob.visible_message("[host_mob] presses a button on [host_mob.p_their()] forearm.",
+ "You press the nanite button on your forearm.", null, 2)
+ SEND_SIGNAL(host_mob, COMSIG_NANITE_SIGNAL, sent_code, "a [name] program")
+
+/datum/action/innate/nanite_button
+ name = "Button"
+ icon_icon = 'icons/mob/actions/actions_items.dmi'
+ check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS
+ button_icon_state = "power_green"
+ var/datum/nanite_program/dermal_button/program
+
+/datum/action/innate/nanite_button/New(datum/nanite_program/dermal_button/_program, _name, _icon, _color)
+ ..()
+ program = _program
+ name = _name
+ button_icon_state = "[_icon]_[_color]"
+
+/datum/action/innate/nanite_button/Activate()
+ program.press()
+
+/datum/nanite_program/research
+ name = "Distributed Computing"
+ desc = "The nanites aid the research servers by performing a portion of its calculations, increasing research point generation."
+ use_rate = 0.2
+ rogue_types = list(/datum/nanite_program/toxic)
+
+/datum/nanite_program/research/active_effect()
+ if(!iscarbon(host_mob))
+ return
+ var/points = 1
+ if(!host_mob.client) //less brainpower
+ points *= 0.25
+ SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = points))
+
+/datum/nanite_program/researchplus
+ name = "Neural Network"
+ desc = "The nanites link the host's brains together forming a neural research network, that becomes more efficient with the amount of total hosts."
+ use_rate = 0.3
+ rogue_types = list(/datum/nanite_program/brain_decay)
+
+/datum/nanite_program/researchplus/enable_passive_effect()
+ . = ..()
+ if(!iscarbon(host_mob))
+ return
+ if(host_mob.client)
+ SSnanites.neural_network_count++
+ else
+ SSnanites.neural_network_count += 0.25
+
+/datum/nanite_program/researchplus/disable_passive_effect()
+ . = ..()
+ if(!iscarbon(host_mob))
+ return
+ if(host_mob.client)
+ SSnanites.neural_network_count--
+ else
+ SSnanites.neural_network_count -= 0.25
+
+/datum/nanite_program/researchplus/active_effect()
+ if(!iscarbon(host_mob))
+ return
+ var/mob/living/carbon/C = host_mob
+ var/points = round(SSnanites.neural_network_count / 12, 0.1)
+ if(!C.client) //less brainpower
+ points *= 0.25
+ SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = points))
+
diff --git a/code/modules/research/nanites/program_disks.dm b/code/modules/research/nanites/program_disks.dm
index 86b7803fc9..f780f40932 100644
--- a/code/modules/research/nanites/program_disks.dm
+++ b/code/modules/research/nanites/program_disks.dm
@@ -130,4 +130,16 @@
program_type = /datum/nanite_program/pacifying
/obj/item/disk/nanite_program/stun
- program_type = /datum/nanite_program/triggered/stun
\ No newline at end of file
+ program_type = /datum/nanite_program/triggered/stun
+
+/obj/item/disk/nanite_program/dermal_button
+ program_type = /datum/nanite_program/dermal_button
+
+/obj/item/disk/nanite_program/research
+ program_type = /datum/nanite_program/research
+
+/obj/item/disk/nanite_program/researchplus
+ program_type = /datum/nanite_program/researchplus
+
+/obj/item/disk/nanite_program/reduced_diagnostics
+ program_type = /datum/nanite_program/reduced_diagnostics
\ No newline at end of file
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 6877ba71f6..af4148d194 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -71,7 +71,7 @@
display_name = "Biological Technology"
description = "What makes us tick." //the MC, silly!
prereq_ids = list("base")
- design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen")
+ design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -960,7 +960,7 @@
prereq_ids = list("datatheory","robotics")
design_ids = list("nanite_disk","nanite_remote","nanite_scanner",\
"nanite_chamber","public_nanite_chamber","nanite_chamber_control","nanite_programmer","nanite_program_hub","nanite_cloud_control",\
- "relay_nanites", "monitoring_nanites", "access_nanites", "repairing_nanites","sensor_nanite_volume", "repeater_nanites", "relay_repeater_nanites")
+ "relay_nanites", "monitoring_nanites", "access_nanites", "repairing_nanites","sensor_nanite_volume", "repeater_nanites", "relay_repeater_nanites","red_diag_nanites")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -969,7 +969,7 @@
display_name = "Smart Nanite Programming"
description = "Nanite programs that require nanites to perform complex actions, act independently, roam or seek targets."
prereq_ids = list("nanite_base","adv_robotics")
- design_ids = list("purging_nanites", "metabolic_nanites", "stealth_nanites", "memleak_nanites","sensor_voice_nanites", "voice_nanites")
+ design_ids = list("purging_nanites", "research_nanites", "metabolic_nanites", "stealth_nanites", "memleak_nanites","sensor_voice_nanites", "voice_nanites")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
export_price = 4000
@@ -978,7 +978,7 @@
display_name = "Mesh Nanite Programming"
description = "Nanite programs that require static structures and membranes."
prereq_ids = list("nanite_base","engineering")
- design_ids = list("hardening_nanites", "refractive_nanites", "cryo_nanites", "conductive_nanites", "shock_nanites", "emp_nanites", "temperature_nanites")
+ design_ids = list("hardening_nanites", "dermal_button_nanites", "refractive_nanites", "cryo_nanites", "conductive_nanites", "shock_nanites", "emp_nanites", "temperature_nanites")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
@@ -1015,7 +1015,7 @@
display_name = "Harmonic Nanite Programming"
description = "Nanite programs that require seamless integration between nanites and biology."
prereq_ids = list("nanite_bio","nanite_smart","nanite_mesh")
- design_ids = list("fakedeath_nanites","aggressive_nanites","defib_nanites","regenerative_plus_nanites","brainheal_plus_nanites","purging_plus_nanites","adrenaline_nanites")
+ design_ids = list("fakedeath_nanites","researchplus_nanites","aggressive_nanites","defib_nanites","regenerative_plus_nanites","brainheal_plus_nanites","purging_plus_nanites","adrenaline_nanites")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000)
export_price = 8000
diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
index caa2ca7adf..76897b5276 100644
--- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
@@ -108,7 +108,7 @@
if (levels.len)
dest = locate(T.x, T.y, pick(levels))
- T.ChangeTurf(/turf/open/chasm)
+ T.ChangeTurf(/turf/open/chasm, flags = CHANGETURF_INHERIT_AIR)
var/turf/open/chasm/C = T
C.set_target(dest)
C.drop(user)
diff --git a/code/modules/spells/spell_types/conjure.dm b/code/modules/spells/spell_types/conjure.dm
index 3ebded7487..38a2d5bddd 100644
--- a/code/modules/spells/spell_types/conjure.dm
+++ b/code/modules/spells/spell_types/conjure.dm
@@ -31,7 +31,7 @@
if(ispath(summoned_object_type, /turf))
var/turf/O = spawn_place
var/N = summoned_object_type
- O.ChangeTurf(N)
+ O.ChangeTurf(N, flags = CHANGETURF_INHERIT_AIR)
else
var/atom/summoned_object = new summoned_object_type(spawn_place)
diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm
index 8b8328abbe..d97d466e4d 100644
--- a/code/modules/spells/spell_types/devil.dm
+++ b/code/modules/spells/spell_types/devil.dm
@@ -234,7 +234,7 @@
dancefloor_exists = FALSE
for(var/i in 1 to dancefloor_turfs.len)
var/turf/T = dancefloor_turfs[i]
- T.ChangeTurf(dancefloor_turfs_types[i])
+ T.ChangeTurf(dancefloor_turfs_types[i], flags = CHANGETURF_INHERIT_AIR)
else
var/list/funky_turfs = RANGE_TURFS(1, user)
for(var/turf/closed/solid in funky_turfs)
@@ -248,7 +248,7 @@
var/turf/T = t
dancefloor_turfs[i] = T
dancefloor_turfs_types[i] = T.type
- T.ChangeTurf((i % 2 == 0) ? /turf/open/floor/light/colour_cycle/dancefloor_a : /turf/open/floor/light/colour_cycle/dancefloor_b)
+ T.ChangeTurf((i % 2 == 0) ? /turf/open/floor/light/colour_cycle/dancefloor_a : /turf/open/floor/light/colour_cycle/dancefloor_b, flags = CHANGETURF_INHERIT_AIR)
i++
/datum/effect_system/smoke_spread/transparent/dancefloor_devil
diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm
index 8108b121ae..c4a2b4aa7e 100644
--- a/code/modules/spells/spell_types/godhand.dm
+++ b/code/modules/spells/spell_types/godhand.dm
@@ -216,4 +216,4 @@
P.original = user
P.firer = user
P.fire()
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm
index 794ed797ad..5f984fa7e3 100644
--- a/code/modules/spells/spell_types/touch_attacks.dm
+++ b/code/modules/spells/spell_types/touch_attacks.dm
@@ -78,8 +78,8 @@
hand_path = /obj/item/melee/touch_attack/nuclearfist
school = "evocation"
- charge_max = 200
+ charge_max = 100
clothes_req = 0
- cooldown_min = 40
+ cooldown_min = 20
- action_icon_state = "nuclearfist"
\ No newline at end of file
+ action_icon_state = "nuclearfist"
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index dedff3ae04..161461d099 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -560,7 +560,7 @@
else if((findtext(message, honk_words)))
cooldown = COOLDOWN_MEME
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(user), 'sound/items/bikehorn.ogg', 300, 1), 25)
- if(user.mind && user.mind.assigned_role == "Clown")
+ if(user.mind && HAS_TRAIT(user.mind, TRAIT_CLOWN_MENTALITY))
for(var/mob/living/carbon/C in listeners)
C.slip(140 * power_multiplier)
cooldown = COOLDOWN_MEME
@@ -807,9 +807,8 @@
E.enthrallTally += (power_multiplier*(((length(message))/200) + 1)) //encourage players to say more than one word.
else
E.enthrallTally += power_multiplier*1.25 //thinking about it, I don't know how this can proc
- if(L.canbearoused)
- if(L.client?.prefs.lewdchem)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[E.enthrallGender] is so nice to listen to."), 5)
+ if(L.canbearoused && E.lewd)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[E.enthrallGender] is so nice to listen to."), 5)
E.cooldown += 1
//REWARD mixable works
@@ -820,7 +819,7 @@
power_multiplier *= distancelist[get_dist(user, V)+1]
if(L == user)
continue
- if (L.client?.prefs.lewdchem)
+ if (E.lewd)
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[E.enthrallGender] has praised me!!"), 5)
if(HAS_TRAIT(L, TRAIT_NYMPHO))
L.adjustArousalLoss(2*power_multiplier)
@@ -832,7 +831,7 @@
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "I've been praised for doing a good job!"), 5)
E.resistanceTally -= power_multiplier
E.enthrallTally += power_multiplier
- var/descmessage = "[(L.client?.prefs.lewdchem?"I feel so happy! I'm a good pet who [E.enthrallGender] loves!":"I did a good job!")]"
+ var/descmessage = "[(E.lewd?"I feel so happy! I'm a good pet who [E.enthrallGender] loves!":"I did a good job!")]"
SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "enthrallpraise", /datum/mood_event/enthrallpraise, descmessage)
E.cooldown += 1
@@ -841,10 +840,10 @@
for(var/V in listeners)
var/mob/living/L = V
var/datum/status_effect/chem/enthrall/E = L.has_status_effect(/datum/status_effect/chem/enthrall)
- var/descmessage = "[(L.client?.prefs.lewdchem?"I've failed [E.enthrallGender]... What a bad, bad pet!":"I did a bad job...")]"
+ var/descmessage = "[(E.lewd?"I've failed [E.enthrallGender]... What a bad, bad pet!":"I did a bad job...")]"
if(L == user)
continue
- if (L.client?.prefs.lewdchem)
+ if (E.lewd)
if(HAS_TRAIT(L, TRAIT_MASO))
L.adjustArousalLoss(3*power_multiplier)
descmessage += "And yet, it feels so good..!" //I don't really understand masco, is this the right sort of thing they like?
@@ -871,7 +870,7 @@
var/datum/status_effect/chem/enthrall/E = C.has_status_effect(/datum/status_effect/chem/enthrall)
REMOVE_TRAIT(C, TRAIT_MUTE, "enthrall")
C.silent = 0
- if(C.client?.prefs.lewdchem)
+ if(E.lewd)
addtimer(CALLBACK(C, /atom/movable/proc/say, "[E.enthrallGender]"), 5)
else
addtimer(CALLBACK(C, /atom/movable/proc/say, "[E.master]"), 5)
@@ -887,7 +886,7 @@
E.phase = 3
E.status = null
user.emote("snap")
- if(L.client?.prefs.lewdchem)
+ if(E.lewd)
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "The snapping of your [E.enthrallGender]'s fingers brings you back to your enthralled state, obedient and ready to serve."), 5)
else
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "The snapping of [E.master]'s fingers brings you back to being under their influence."), 5)
@@ -910,11 +909,11 @@
addtimer(CALLBACK(H, /atom/movable/proc/say, "I feel happy being with you."), 5)
continue
if(2)
- speaktrigger += "[(H.client?.prefs.lewdchem?"I think I'm in love with you... ":"I find you really inspirational, ")]" //'
+ speaktrigger += "[(E.lewd?"I think I'm in love with you... ":"I find you really inspirational, ")]" //'
if(3)
- speaktrigger += "[(H.client?.prefs.lewdchem?"I'm devoted to being your pet":"I'm commited to following your cause!")]! "
+ speaktrigger += "[(E.lewd?"I'm devoted to being your pet":"I'm commited to following your cause!")]! "
if(4)
- speaktrigger += "[(H.client?.prefs.lewdchem?"You are my whole world and all of my being belongs to you, ":"I cannot think of anything else but aiding your cause, ")] "//Redflags!!
+ speaktrigger += "[(E.lewd?"You are my whole world and all of my being belongs to you, ":"I cannot think of anything else but aiding your cause, ")] "//Redflags!!
//mood
var/datum/component/mood/mood = H.GetComponent(/datum/component/mood)
@@ -1003,7 +1002,7 @@
speaktrigger += "I feel like I'm on the brink of losing my mind, "
//horny
- if(HAS_TRAIT(H, TRAIT_NYMPHO) && H.canbearoused && H.client?.prefs.lewdchem)
+ if(HAS_TRAIT(H, TRAIT_NYMPHO) && H.canbearoused && E.lewd)
switch(H.getArousalLoss())
if(40 to 60)
speaktrigger += "I'm feeling a little horny, "
@@ -1013,10 +1012,10 @@
speaktrigger += "I'm really, really horny, "
//collar
- if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar) && H.client?.prefs.lewdchem)
+ if(istype(H.wear_neck, /obj/item/clothing/neck/petcollar) && E.lewd)
speaktrigger += "I love the collar you gave me, "
//End
- if(H.client?.prefs.lewdchem)
+ if(E.lewd)
speaktrigger += "[E.enthrallGender]!"
else
speaktrigger += "[user.first_name()]!"
@@ -1044,7 +1043,7 @@
REMOVE_TRAIT(C, TRAIT_MUTE, "enthrall")
C.silent = 0
E.cooldown += 3
- to_chat(user, "You [(C.client?.prefs.lewdchem?"allow [C] to speak again":"encourage [C] to speak again")].")
+ to_chat(user, "You [(E.lewd?"allow [C] to speak again":"encourage [C] to speak again")].")
//Antiresist
@@ -1074,7 +1073,7 @@
for(var/mob/living/carbon/C in listeners)
var/datum/status_effect/chem/enthrall/E = C.has_status_effect(/datum/status_effect/chem/enthrall)
if(E.phase == 4)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You're unable to forget about [(C.client?.prefs.lewdchem?"the dominating presence of [E.enthrallGender]":"[E.master]")]!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You're unable to forget about [(E.lewd?"the dominating presence of [E.enthrallGender]":"[E.master]")]!"), 5)
continue
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You wake up, forgetting everything that just happened. You must've dozed off..? How embarassing!"), 5)
C.Sleeping(50)
@@ -1086,7 +1085,7 @@
if(3)
E.phase = 0
E.cooldown = 0
- if(C.client?.prefs.lewdchem)
+ if(E.lewd)
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You revert to yourself before being enthralled by your [E.enthrallGender], with no memory of what happened."), 5)
else
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You revert to who you were before, with no memory of what happened with [E.master]."), 5)
@@ -1112,7 +1111,7 @@
var/mob/living/carbon/human/H = V
var/datum/status_effect/chem/enthrall/E = H.has_status_effect(/datum/status_effect/chem/enthrall)
if(E.phase > 1)
- if(HAS_TRAIT(H, TRAIT_NYMPHO) && H.canbearoused && H.client?.prefs.lewdchem) // probably a redundant check but for good measure
+ if(HAS_TRAIT(H, TRAIT_NYMPHO) && H.canbearoused && E.lewd) // probably a redundant check but for good measure
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "Your [E.enthrallGender] pushes you over the limit, overwhelming your body with pleasure."), 5)
H.mob_climax(forced_climax=TRUE)
H.SetStun(20)
@@ -1168,7 +1167,7 @@
for(var/obj/item/W in items)
if(W == H.wear_suit)
H.dropItemToGround(W, TRUE)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "Before you can even think about it, you quickly remove your clothes in response to [(H.client?.prefs.lewdchem?"your [E.enthrallGender]'s command'":"[E.master]'s directive'")]."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "Before you can even think about it, you quickly remove your clothes in response to [(E.lewd?"your [E.enthrallGender]'s command'":"[E.master]'s directive'")]."), 5)
E.cooldown += 10
//WALK
@@ -1206,7 +1205,7 @@
if(2 to INFINITY)
L.lay_down()
E.cooldown += 10
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[(L.client?.prefs.lewdchem?"You eagerly lie down!":"You suddenly lie down!")]"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[(E.lewd?"You eagerly lie down!":"You suddenly lie down!")]"), 5)
to_chat(user, "You encourage [L] to lie down.")
//KNOCKDOWN
@@ -1237,7 +1236,7 @@
for (var/trigger in E.customTriggers)
speaktrigger += "[trigger], "
to_chat(user, "[C] whispers, \"[speaktrigger] are my triggers.\"")//So they don't trigger themselves!
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You whisper your triggers to [(C.client?.prefs.lewdchem?"Your [E.enthrallGender]":"[E.master]")]."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You whisper your triggers to [(E.lewd?"Your [E.enthrallGender]":"[E.master]")]."), 5)
//CUSTOM TRIGGERS
@@ -1249,7 +1248,7 @@
if (get_dist(user, H) > 1)//Requires user to be next to their pet.
to_chat(user, "You need to be next to your pet to give them a new trigger!")
continue
- if(!H.client?.prefs.lewdchem)
+ if(!E.lewd)
to_chat(user, "[H] seems incapable of being implanted with triggers.")
continue
else
@@ -1272,7 +1271,7 @@
E.customTriggers[trigger] = trigger2
log_game("FERMICHEM: [H] has been implanted by [user] with [trigger], triggering [trigger2].")
E.mental_capacity -= 5
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(H.client?.prefs.lewdchem?"your [E.enthrallGender]":"[E.master]")] whispers you a new trigger."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(E.lewd?"your [E.enthrallGender]":"[E.master]")] whispers you a new trigger."), 5)
to_chat(user, "You sucessfully set the trigger word [trigger] in [H]")
else
to_chat(user, "Your pet looks at you confused, it seems they don't understand that effect!")
@@ -1290,7 +1289,7 @@
if (get_dist(user, H) > 1)//Requires user to be next to their pet.
to_chat(user, "You need to be next to your pet to give them a new echophrase!")
continue
- if(!H.client?.prefs.lewdchem)
+ if(!E.lewd)
to_chat(user, "[H] seems incapable of being implanted with an echoing phrase.")
continue
else
@@ -1334,7 +1333,7 @@
objective = replacetext(lowertext(objective), "suicide", "self-love")
message_admins("[H] has been implanted by [user] with the objective [objective].")
log_game("FERMICHEM: [H] has been implanted by [user] with the objective [objective] via MKUltra.")
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(H.client?.prefs.lewdchem?"Your [E.enthrallGender]":"[E.master]")] whispers you a new objective."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(E.lewd?"Your [E.enthrallGender]":"[E.master]")] whispers you a new objective."), 5)
brainwash(H, objective)
E.mental_capacity -= 200
to_chat(user, "You sucessfully give an objective to [H]")
@@ -1348,7 +1347,7 @@
for(var/V in listeners)
var/mob/living/carbon/human/H = V
var/datum/status_effect/chem/enthrall/E = H.has_status_effect(/datum/status_effect/chem/enthrall)
- if(E.phase >= 3 && H.client?.prefs.lewdchem)
+ if(E.phase >= 3 && E.lewd)
var/instill = stripped_input(user, "Instill an emotion in [H].", MAX_MESSAGE_LEN)
to_chat(H, "[instill]")
to_chat(user, "You sucessfully instill a feeling in [H]")
@@ -1363,7 +1362,7 @@
if(E.phase > 1)
if(user.ckey == E.enthrallID && user.real_name == E.master.real_name)
E.master = user
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(H.client?.prefs.lewdchem?"You hear the words of your [E.enthrallGender] again!! They're back!!":"You recognise the voice of [E.master].")]"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(E.lewd?"You hear the words of your [E.enthrallGender] again!! They're back!!":"You recognise the voice of [E.master].")]"), 5)
to_chat(user, "[H] looks at you with sparkling eyes, recognising you!")
//I dunno how to do state objectives without them revealing they're an antag
diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index a2a9c37cfd..1415604aff 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -21,7 +21,7 @@
/obj/vehicle/sealed/car/clowncar/auto_assign_occupant_flags(mob/M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
- if(H.mind && H.mind.assigned_role == "Clown") //Ensures only clowns can drive the car. (Including more at once)
+ if(H.mind && HAS_TRAIT(H.mind, TRAIT_CLOWN_MENTALITY)) //Ensures only clowns can drive the car. (Including more at once)
add_control_flags(M, VEHICLE_CONTROL_DRIVE|VEHICLE_CONTROL_PERMISSION)
return
add_control_flags(M, VEHICLE_CONTROL_KIDNAPPED)
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 626abd51ef..6144f4c57a 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -70,14 +70,22 @@
/obj/item/clothing/under/skirt/red = 3,
/obj/item/clothing/under/skirt/purple = 3,
/obj/item/clothing/under/sundress = 4,
+ /obj/item/clothing/under/sundresswhite = 4,
/obj/item/clothing/under/stripeddress = 3,
/obj/item/clothing/under/sailordress = 3,
+ /obj/item/clothing/under/sweptskirt = 3,
+ /obj/item/clothing/under/greendress = 3,
+ /obj/item/clothing/under/pinkdress = 3,
/obj/item/clothing/under/redeveninggown = 3,
/obj/item/clothing/under/blacktango = 3,
+ /obj/item/clothing/under/westernbustle = 3,
+ /obj/item/clothing/under/flamenco = 3,
+ /obj/item/clothing/under/flowerdress = 3,
/obj/item/clothing/under/plaid_skirt = 3,
/obj/item/clothing/under/plaid_skirt/blue = 3,
/obj/item/clothing/under/plaid_skirt/purple = 3,
/obj/item/clothing/under/plaid_skirt/green = 3,
+ /obj/item/clothing/under/croptop = 3,
/obj/item/clothing/glasses/regular = 2,
/obj/item/clothing/glasses/regular/jamjar = 2,
/obj/item/clothing/head/sombrero = 3,
diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm
index 5c092c3659..03241c4a86 100644
--- a/code/modules/vending/megaseed.dm
+++ b/code/modules/vending/megaseed.dm
@@ -14,6 +14,7 @@
/obj/item/seeds/chanter = 3,
/obj/item/seeds/chili = 3,
/obj/item/seeds/cocoapod = 3,
+ /obj/item/seeds/coconut = 3,
/obj/item/seeds/coffee = 3,
/obj/item/seeds/cotton = 3,
/obj/item/seeds/corn = 3,
diff --git a/html/changelog.html b/html/changelog.html
index 8eabba83df..60412299cf 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,328 @@
-->
+ 30 December 2019
+ AnturK updated:
+
+ - Fixed ranged syndicate mobs stormtrooper training.
+
+ Arturlang updated:
+
+ - Adds Bloodsuckers, beware.
+
+ BlueWildrose updated:
+
+ - Fixed stargazers being unable to link to themselves if mindshielded or if holding psionic shielding devices (tinfoil hats) when the species is set.
+ - Fixes non-roundstart slimes being unable to wag their tail.
+
+ Commandersand updated:
+
+ - added two words to clown filter
+ - Added new things to loadouts, check em
+
+ DeltaFire15 updated:
+
+ - Clock cult kindle no longer cares about oxygen damage
+ - changed mecha internals access for some special mechs.
+ - no more mech maintenance access for engineers.
+ - All heads of staff can now message CC
+ - Removes a magicnumber
+ - Rebalanced cult vs cult stun effects to debuff instead of stun
+
+ Detective-Google updated:
+
+ - short hair 80's is no longer jank
+
+ Fermis updated:
+
+ - tweaked how super bases/acids work but limiting them
+
+ Fikou updated:
+
+ - the windup toolbox now has some more "realistic" sounds
+ - the windup toolbox now rumbles again
+
+ Ghommie updated:
+
+ - Fixed hulks, sleeping carp users, pacifists and people with chunky fingers being able to unrestrictly use gun and pneumatic cannon circuit assemblies.
+ - Fixed gun circuit assemblies being only usable by human mobs.
+ - Doubled the locomotion circuit external cooldown, thus halving the movable assemblies' movespeed.
+ - Made wooden cabinet/closets... actually made of wood.
+ - Wooden cabinets are now deconstructable with a screwdriver.
+ - Deconstruction of large crates and other closet subtypes deconstructable with tools other than the welder is no longer instant.
+ - You shouldn't be able to target objects you can't see (excluding darkness) with the ARCD and RLD
+ - The admin RCD is ranged too, just like the ARCD.
+ - Fixed welding, thirteen loko, welding and wraith spectacles not blinding people as expected. Thank you all whomst reported this issue in the suggestions box channel instead of the github repository's issues section, very smart!
+ - Fixed on_mob eyes overlays not updating properly in certain cases.
+ - Fixed deconversion from bloodshot eyes blood cult resetting your eyes' color to pitch black instead of their previous color, more or less.
+ - Spinfusor nerf: Upped the casing and ammo box size by one step, removed the projectile's dismemberment value (explosions can still rip a limb or two off), halved the ammo box capacity, reduced the spinfusor ammo supply pack contents from 32 to 8, removed the casing's ability to explode when thrown.
+ - Fixes bubblegum's death not unlocking the arena shuttle buyment.
+ - Fixed alien tech node not being unlockable with subtypes of the accepted items.
+ - Fixed reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove() instead of do_teleport()
+ - Fixed space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter.
+ - Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago.
+ - Added a "convalescence" time (about 15 seconds) after the user is out of unconsciousbess/crit to ensure they are properly stabilized.
+ - Added a 15 minutes hardcap for accumulated revive cooldown (equivalent to 150 points of brute or burn healed) above which the implant starts cooling down regardless of user's conditions.
+ - Fixed AI core displays I may have broken with my coding extravaganza.
+ - Blue, Amber and Red security alert sounds should be half as loud now.
+ - Buffed clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
+ - Clown ops too also suffer from not holding or wearing clown shoes now.
+ - Fixed a few holo barriers lacking transparency.
+ - Fixed character setup preview bodyparts not displaying correctly most of times.
+ - Fixed character appearance preview displaying the mannequin in job attire instead of undergarments.
+ - Fixed raven's shuttle computer not being of the emergency shuttle type.
+ - Blood bank generators can now be anchored and unanchored now.
+ - Ghost mentors can now orbit around the target instead of setting their view to theirs'.
+ - Fixes a ghostchat eavesdropping exploit concerning VR.
+ - Fixes VR deaths being broadcasted in deadchat.
+ - Fixed a few pill bottle issues with the ChemMaster.
+ - Fixes a few negative quirks not being properly removed when deleted.
+ - Phobia and mute quirks are no longer cheesed by brain surgery grade healing or medicines.
+ - Fixed double-flavour (and bland custom) ice creams.
+ - Fixed Pubbystation's wall Nanomeds being inconsistent with other stations'.
+ - dextrous simplemobs can now swap action intent with 1, 2, 3, 4 now. Just like humies, ayys and monkys.
+ - Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway.
+ - Removed the old (almost) unused roboticist encryption key and headset.
+ - Fixed goose meat.
+ - Fixed a little door assembly glass dupe exploit
+ - Fixed AI holopad speech text being small and whispers that in multiple exclamation marks echo through multiple areas.
+ - Removed literally atrocious polka dotted accessories. They were even more atrocious than the yellow horrible tie.
+
+ Ghommie (also porting PRs by AnturK and Arkatos) updated:
+
+ - Fixed light eaters not burning out borg lamplights and flashes. fix Fixed light eater not affecting open turfs emitting lights such as light tiles and fairy grass.
+ - Fixed an empty reference about light eater armblade disintegration after Heart of Darkness removal.
+
+ Ghommie, Skogol updated:
+
+ - refactored altclick interaction to allow alt-click interactable objects to parent call without forcing the turf contents stat menu open.
+ - Alt clicking will no longer show turf contents for items inside bags etc.
+ - Alt clicking the source of your turf contents stat menu will now close said menu.
+
+ GrayRachnid updated:
+
+ Hatterhat updated:
+
+ - Regenerative nanites, a "chemical" used in the combat stimulant injector. Actually quite stimulating, and not bad in a pinch for a nuclear operative. Check the Combat Medic Kit!
+ - The Combat Medic Kit now has an advanced health analyzer and medisprays instead of patches and a chloral syringe.
+ - The Advanced Syndicate Surgery Duffelbag or whatever it was doesn't get the better injector, because nobody uses it and so nobody's bothered to update it.
+ - .357 speedloaders can now be printed with the Advanced Illegal Ballistics node on the tech tree!
+ - okay so i may have given the .357 an extra speedloader at the same cost but it comes in a box now
+
+ ItzGabby updated:
+
+ - Fixed AltClick on polychromic collars so they actually work now.
+
+ KeRSedChaplain updated:
+
+ - Extends the file "deltakalaxon.ogg" to a 38 second .ogg.
+
+ Linzolle updated:
+
+ - neck slice. harm intent someone's head while they are unconscious or in a neck grab to make them bleed uncontrollably.
+ - officer's sabre now properly makes the unsheating and resheating noise
+ - fireman failure has a different message depending on the circumstance
+ - Abductor chem dispenser, and added it to the abductor console.
+ - "Superlingual matrix" to the abductor console. It's the abductor's tongue. Can be used to link it to your abductor communication channel and then implanted into a test subject.
+ - Shrink ray and added it to the abductor console.
+ - Shrink ray sound effect (its the fucking mega man death sound)
+ - special jumpsuit for abductors
+ - abductor jumpsuit, including digi version if a digitigrade person somehow manages to get their hands on it. sprites for the shrink ray and chem dispenser.
+ - new glands to play with, including the all-access gland, the quantum gland, and the blood type randomiser.
+ - split every gland into its own file instead of all being in one file
+ - cosmic coat crafting recipe changed to coat + cosmic bedsheet
+
+ Mickyan, nemvar, RaveRadbury, AnturK, SpaceManiac updated:
+
+ - Certain incompatible quirks can no longer be taken together.
+ - If an admin sends a ghost back to the lobby, they can now choose a different set of quirks.
+ - the quirk menu went through some minor formatting changes.
+ - Podcloning now lets you keep your quirks.
+ - Quirks have flavor text in medical records.
+ - All quirk medical records refer to "Patient", removing a few instances of "Subject".
+ - Quirks no longer apply to off-station roundstart antagonists.
+ - Mood quirks are now only processed by the quirk holders
+
+ Narcissisko (ported by Hatterhat) updated:
+
+ - Luxury Bar Capsule, at 10,000 points. Comes with no medical supplies, a bar, and a bunch of cigars. Ported from tgstation/tgstation#45547.
+
+ Nervere and subject217, Militaires, py01, nemvar updated:
+
+ - The cook's CQC now only works when in the kitchen or the kitchen backroom.
+ - corrected CQC help instructions
+ - CQC and Sleeping Carp are properly logged.
+ - CQC can passively grab targets when not on grab intent. Passive grabs do not count towards combos for CQC or Sleeping carp.
+ - Martial Art and NOGUN cleanup.
+
+ PersianXerxes updated:
+
+ - Removed night vision quirk
+
+ Putnam updated:
+
+ - acute hepatic pharmacokinesis now works if you already have relevant genitals
+ - Contamination is no longer an infinitely spreading deadly contagion causing mass panic
+ - Dynamic rulesets have lower weight if a round recently featured them (except traitor).
+
+ Putnam3145 updated:
+
+ - Buffed HE pipes by making them realistically radiate away heat.
+ - Dynamic has a (totally unused for any relevant purpose) roundstart report now.
+ - A whole bunch of dynamic data is now available for statbus
+ - Dynamic from-ghost antags no longer double dip on threat refunds when the mode fails due to not enough applications.
+ - whoops broke quirks
+ - quirks work
+ - New tab in preferences screen: "ERP preferences"
+ - New opt-outs for individual effects of incubus draught, succubus milk
+ - Acute hepatic pharmacokinesis has been removed, replaced with above
+ - Renamed "Toggle Lewdchem" to "Toggle Lewd MKUltra", since that's what it actually means, and made it toggle the "hypno" setting (rename it again if more hypno mechanics are added).
+ - Made MKUltra's lewd messages require both people involved to have hypno opted-in.
+ - Buncha dynamic config tweaks
+ - Ghost cafe spawns are actual ghost roles by the game's reckoning now
+ - a runtime in radioactive contamination
+ - Bomb armor now acts like other armor types.
+ - Devastation-level explosions on armorless people no longer destroys everything in their bags.
+
+ Seris02 updated:
+
+ - the clowns headset
+ - distance checks
+ - the sprites
+ - added the runed and brass winter coats (cosmetic ratvarian/narsian)
+ - how the narsian/ratvarian coats can be made
+ - fixes some ghost roles from dying of stupid shit
+ - pandoras attacking their owners
+ - Added Rising Bass and the shifting scroll.
+ - Changes the martial arts scroll in the uplink to "Sleeping Carp Scroll"
+
+ ShizCalev updated:
+
+ - Fixed floodlights not turning off properly when they're underpowered.
+ - Fixed emitters not changing icons properly when they're underpowered.
+
+ Sishen1542 updated:
+
+ - Clicking a pack of seeds with a pen allows you to set the plant's name, description and the pack of seeds' description. Useful for differentiating genetically modified plants. These changes will persist through different generations of the plant.
+ - Hydroponics trays update their name and description to reflect the plant inside them. They revert to default when emptied.
+
+ Toriate updated:
+
+ - Polychromic shorts now have a digitigrade state
+
+ Trilbyspaceclone updated:
+
+ - ports all the new donuts, burgars, and chicken stuff from RG
+ - ports new snowcone
+ - ports grill
+ - ports beakfeast tag/mood lit as TG has it
+ - ports all the amazing new sprites
+ - ports crafting for many things like snowcones needing water
+ - ports of many craftings
+ - lowers fryers sound
+ - ported icons for new food/grill
+ - ports the deletion of some icons and images
+ - ports a spell check for the snowcones
+ - ports fixes for stuff I didnt know were even broken with snowcones
+ - coder cat failers to push the last commit from year(s) ago
+ - Updates the changlogs
+ - meat hook from HUGE to bulky
+ - CE hardsuit is now more rad-proof
+ - Wrong icon names, missing dog fashion with telegram hat
+ - New softdrink that comes in its own vender!
+ - Honey now has a reaction with plants
+ - Buzz fuzz now only has a 5% to give honey and will now give 1u of sugar not 2
+ - Blaster shotguns back into armory
+ - Removed Lighters in thunderdomes
+ - Silicons now know what a slime is saying!
+ - honey now will not kill slimes. Honey slimepeople can be a thing now, go sci.
+ - Added insulin into many of the borg hypo's
+
+ Useroth updated:
+
+ - bamboo which can be used to build punji sticks/ blowguns available as a sugarcane mutation or in exotic seed crate
+ - changed the sugar cane growth stages because fuck if I know why, but it was in the PR
+ - New lavaland ruin: Pulsating tumor
+ - New class of lavaland mobs, a bit weaker than megafauna but still stronger than most of what you normally see
+ - Ghost cafe spawner. For letting people spawn as their own character in the ninja holding facility. It bypasses the usual check, so people who have suicided/ghosted/cryod may use it.
+ - Dorms in the ninja holding facility.
+
+ Xantholne updated:
+
+ - Santa Hats to Loadout and Clothesmate
+ - Christmas Wintercoats to Loadout and Clothesmate
+ - Christmas male and female uniforms to loadout and Clothesmate
+ - Red, Green, and Traditional Santa boots to loadout and Clothesmate
+ - Christmas Socks, Red candycane socks, Green candycane socks to sock selection
+
+ kappa-sama updated:
+
+ - legion drops more crates now
+ - .357 speedloaders in autolathes are now individual bullets instead, speedloaders are now illegal tech, costs less total metal to make 7 bullets than a previous speedloader. 7.62mm bullets in autolathe when hacked and costs more metal to make 5 7.62mm bullets than getting a clip from the seclathe.
+ - mentions that you can refill speedloaders on .357 uplink description
+ - you can now strip people while aggrograbbing or higher
+ - plasmafist to wizard
+ - modular is gone
+ - martial apprentices for the local Chinese wizard
+ - broodmother baby lag
+ - you can no longer get 100k credits by spending 4k roundstart
+ - cooking oil in sunflowers instead of corn oil
+ - throats are no longer slit happy
+
+ keronshb updated:
+
+ - Adds reflector blobs to shield blob upgrades
+
+ kevinz000 updated:
+
+ - Launchpads can now take number inputs for offsets rather than just buttons.
+ - nanites no longer spread through air blocking objects
+ - Night vision readded as a darkness dampening effect rather than darksight.
+ - conveyors can only stack items on tiles to 150 now.
+ - added 8 character save slots
+ - Cargo shuttle now silently ignores slaughter demons/revenants instead of being blocked even while they are jaunted. A drawback is that manifested ones can't block it either, any more.
+ - flashbangs process light/sound separately and uses viewers(), so xray users beware.
+ - Stat() slowed down for anti-lag measures.
+ - sprint/stamina huds now work again
+ - Combat defibs now instant stun on disarm rather than 1 second again
+ - Defibs are now always emagged when emagged with an emag rather than EMP.
+ - aooc toggling now only broadcasts to antagonists
+ - Antag rep proc is now easier to read and supports returning a list.
+ - Clockwork marauders are now on a configured summon cooldown if being summoned on station. They also rapidly bleed health while in or next to space. And they glow brighter.
+
+ lolman360 updated:
+
+ - Added ability to pick up certain simplemobs.
+
+ nemvar updated:
+
+ - The brains of roundstart borgs no longer decay.
+ - Refactored the visibility of reagents for mobs.
+
+ nicbn, Kevinz000, ShizCalev updated:
+
+ - Fire alarm is now simpler. Touch it to activate, touch it to deactivate. When activated, it will blink inconsistently if it is emagged.
+ - You can no longer spam fire alarms. Also, they're logged again.
+ - Fixed fire alarms not updating icons properly after being emagged and hacked by Malf AI's.
+
+ r4d6 updated:
+
+ - Added a N2O pressure tank
+ - Removed a AM Shielding from the crate
+ - Added Handshakes
+ - Added Nose booping
+ - Added submaps for the SM, Tesla and Singulo
+ - Added a placeholder on Boxstation for the Engines
+ - fixed Nose boops not triggering
+
+ shellspeed1 updated:
+
+ - Adds Insect markings
+ - Adds three new moth wings.
+
+
07 December 2019
AffectedArc07 updated:
@@ -546,2067 +868,6 @@ _Kathrin's Box Beautification:_
- Added Departements Winter Coats to the loadout list.
-
- 04 November 2019
- 4dplanner, MMiracles updated:
-
- - Wizard shapeshift now converts damage taken while transformed
- - transform spell transfers damage correctly instead of healing most of the time
- - 0% simplemob health maps to 0 carbon health, 100% simplemob to 100% carbon
- - transforming to a form with brute resistance no longer heals you
- - transforming back to a species with brute resistance no longer heals you
-
- AdmiralPancakes1 updated:
-
- - Cryo cell shortcuts: alt-click toggles the doors, ctrl-click toggles the power
-
- Alonefromhell updated:
-
- - Ported Oracle UI, a framework for self-updating and neat UI's
- - Paper now uses OUI
- - Bins now use OUI
- - fixes tootip offset
-
- AnalWerewolf updated:
-
- - Fritz plushie
- - Donor item
-
- Anonymous updated:
-
- - More crusader armor variants to pick from armament: Teutonic and Hospitaller.
-
- Arturlang updated:
-
- - You can now use CTRL and ALT click on pumps and filters to toggle them on and off and max their output respectively
- - You can now use RPDs on windows and grilles.
- - The RD can now suplex a immovable rod. Good fucking luck.
- - Fixes high alert ERT suit sprites. You can see them now!
- - Traitor codewords are now highlighted for traitors.
- - You can now examine pumps filters and mixers to see if you can use CTRL and Alt click on them.
- - Fixes brain damage/trauma healing nanites so they actually work while there are only traumas.
- - Advanced toxin filtration nanites now heal slimes
-
- Bhijn updated:
-
- - It's now possible to forcefully eject the occupants of a dogborg's sleeper by using a crowbar on them. This action is instant.
- - Resist values for dogborg sleepers have been adjusted. The baseline has been decreased from 30 seconds to 15 seconds. Medihound sleepers have a resist timer of 3 seconds. Sechound sleepers retain a resist timer of 30 seconds.
- - It now takes 10 full seconds to insert people into your sleeper. This should hopefully give people some more room to breathe and react to a dogborg attempting to sleeper someone either for no reason or in a way that violates law 2.
- - Warp whistles no longer grant permanent invulnerability and invisibility
- - You can now actually use the resist hotkey to resist out of handcuffs. Woah, revolutionary
- - the `!tgs poly` command now actually works
- - Poly now has a 0.01% chance per squawk to speak through the TGS relay.
- - The point production mode of radiation collectors has been reverted to the original behavior of using all of the stored power every process cycle instead of just 4% of it
- - Radiation collectors now display the amount of power/research points they're producing per minute rather than per process cycle, which should hopefully clear up a lot of confusion.
- - Radiation collectors also display what's happening to the gas within them, which should make it a lot more obvious as to how you get tritium.
- - Security borgs and K9s are now only available during red alert or higher.
- - Headmins or other folks with access to the server's config can choose the minimum alert level for secborgs to be chosen via the MINIMUM_SECBORG_ALERT config option. See the default game_options.txt for more info.
- - The server no longer attempts to check if the CID matches the IP of any bans, or if the IP matches any CIDs of any active bans, during client analyzation
- - Vampires can now only ventcrawl in bat form if their blood level is below the bad blood volume (224 blood total)
- - Vampires now only take 5 burn per mob life cycle while within chapel areas, down from the original 20 burn per life cycle.
- - K9 pounces have received a minor rework. It now has an effective cooldown of 2.5 seconds, can now only deal up to 120 staminaloss, deals a maximum of 80 stamloss on hit, has a spoolup of half a second, and now has telegraphing in the form of a quiet noise.
- - K9s now only have 80 health
- - Secborgs (but not k9s) now have a hybrid taser. This can be toggled via server config.
- - The disabler cooler upgrade now applies to all energy-based firearms for borgs
- - Dogborg jaws are now capable of incapacitating targets if using help intent. This deals a hard stun depending on how much staminaloss the target has, and whether or not they're resting. This behavior can be toggled via server config.
- - K9 jaws now have 15 force, up from their nerfed 10 force.
- - Borg flashes regained their ability to cause knockdown. This can be toggled via server config.
- - The WEAKEN_SECBORG config option will disable the new dogborg jaws mechanic and make secborgs spawn with a standard disabler.
- - The DISABLE_BORG_FLASH_KNOCKDOWN will disable the ability for borg flashes to knockdown.
- - Jukeboxes now have 6 audio channels available to them, up from the previous accidental 2 and previously intended 5 channels.
- - Jukeboxes now work again on clients running versions higher than 512.1459.
- - People will no longer have their ears consumed by an eldritch god if multiple jukeboxes are active and the first jukebox in the jukebox list stops playing, then tries to play again
- - Instead of the debug text for invalid jukebox behavior being printed to world, the debug text is now restricted to the runtime panel.
-
- BurgerB updated:
-
- - Tweaked the UI of the loadout to be less cluttered due to an issue with formatting.
-
- BurgerBB updated:
-
- - Adds the bonermeter; a device that measures arousal based statistics.
- - Added a new input to the electrostimulator that controls the strength of the shock. It accepts negative inputs which reduce arousal. Added a new output to the electrostimulator that displays the amount of arousal gained.
- - Rebalanced the electro-stimulator to be less spammy by giving it a 2.5 second enforced cooldown per circuit contraption. Increased the complexity of electro stimulator from 10 to 15.
- - Reworked the Vent Clog event to spray smoke instead of foam, also made it shoot smoke over time instead through each vent instead of all at once.
- - Increased the spawn area of the City of Cogs (Reebe). This does not affect the area in which builders can build.
- - Significantly tweaks the Wizard race transformation event to be less unreasonably troublesome.
- - Adds a new 0 cost trait that makes you immune* to Crocin and Hexacrocin
- - Tweaks how slurring works so it's more of a gradual change into slurring instead of immediate.
- - Slurring is now directly proportional to your drunkenness, with other sources of slur being added on top of it.
- - Bras are now separate from underwear, meaning you can mix and match bras if you're into that.
- - Men can wear female accessory clothing, and females can wear men accessory clothing. It's not a fetish, mom, it's PROGRESSIVE.
- - Reorganized accessories into their own files to prevent a massive 1000 line file.
- - i'm 10% sure that merging this PR will cause preference corruption sooooooooooo I just need to hear from @deathride58 or perhaps someone else on how much damage this could possibly do.
- - Tweaked penis.
- - Rebalanced penis.
- - Added the following reagents to the common list of vent clog reagents: ~~Cooking Oil~~, ~~Frost Oil~~, Sodium Chloride, Corn Oil, Uranium, Carpet, Firefighting Foam, semen, femcum, tear juice, strange reagent, ~~spraytan~~.
- - Vent Clog smoke emits the same transparent smoke as a smoke machine, including how much it transfers. Vent Clogs also do not trigger in areas deemed "Safe" in code, such as in the dorms or trusted areas where dangerous things shouldn't occur.
- - Adds additional random brain damage text
- - Adds penis enlargement pills.
- - Adds Stun Circuit and Pneumatic Cannon Integrated Circuits
- - Fixed extinguisher and smoke circuits not accepting any reagents.
- - Adds a few important clockcult tips.
- - Added Mech Sensors, a brass-created trap that activates when a mech not controlled by a cultist crosses it.
- - Added power nullifiers, an emp trap that emps everything in a 3x3 area, with the center suffering a heavy EMP.
- - Brass Skewers now deal 50 damage to mechs.
- - Ass slapping only works if you're actually behind the target. Ass slapping now respects disarm blocking. You can no longer face/ass slap someone on an intent other than help, unless they are also face/ass slapping.
- - Fixed ass and face slapping grammar.
- - Adds meh effects for ass and face slapping.
- - "Unwillingly" eating food now sends a warning message instead of a notice. Unable to stuff food down your throat sends a danger message instead of a warning message.
- - Adds clockwork reflectors, a fragile anti-laser reflection shield object that can be constructed for 10 brass sheets. Upon firing on the object in the direction where it is shielded, it ricochets the bullet off of it relative to the shooting angle.
- - Renames some windows in the build menu for consistency.
- - Clockwork Cult walls can no longer be deconstructed by RCDs when heated.
- - Adds several new toy loot to the arcade machine.
- - Rebalanced the arcade machine loot. Battlemachines now have a 0.5 second delay instead of a second delay between actions.
- - Fixed a bug that would not allow the one in a million pulse rifle to spawn.
- - Adds a new trait "Buns of Steel" that makes you immune to the effects of ass slapping, and temporarily makes the user's arm useless like a stun baton hit. It costs 0 points.
- - Ass slapping blowback from the Buns of Steel perk now deals 20 stamina damage instead of 50, and no brute damage.
- - Gamemode voting results are displayed at the end-round screen.
- - Cloning no longer gives you positive mutations, but a chance for a negative one. Cloning has a chance to "scramble" your visual DNA.
- - Chestbursters no longer give and remove your brain. They just disembowel and kill you now.
- - Fixes WarOps miscalculating players.
- - Activating the nuclear device during war-ops informs the crew of the nuke's position.
- - The alert level is displayed at the job selection screen.
- - Central Command informs you when a Meteor Storm is about to hit 5 to 10 minutes before it happens.
-
- BurgerLUA updated:
-
- - Added a new framework for reagents. Reagents can now have a bool that determines if it can be detected by handheld medical analyzers. Currently only the changeling sting chemical does this.
- - Made changeling transformation string last between 10-15 minutes. Lowered the dna cost of changeling sting from 3 dna to 2 dna. Lowered the chemical cost from 50 to 10. Lowered the loudness from 2 to 1. Changeling sting transformation can be removed via high doses of calomel.
- - Fixed most reagents having a placeholder color.
- - Fixed autolathe wires not correctly shocking you when pulsed.
- - Rebalanced special jetpacks.
-
- CalamaBanana updated:
-
- - Added Deer taur
- - Added Elf ears to mammals
-
- CameronWoof updated:
-
- - Medihounds now have rollerbeds for non-vore patient transport
- - The closed O2 crate now uses the same color scheme as the open one
- - air alarms are green now instead of blue when the atmosphere is ideal
- - Hexacrocin overdose no longer causes climaxes
- - Altered the icons for inventory backplates. Sleek! Stylish! New!
- - Attaching a beaker that contains water to an IV stand no longer causes a visual glitch
- - Fluid-producing sexual organs no longer start full
- - Sexual organ fluid capacity decreased from 50 to 15
- - Sexual organ production rate decreased from 5u to 0.035u per two seconds.
- - Sexual fluid decals no longer contain reagents
- - Sexual fluids cannot by synthesized (e.g., by the Odysseus)
-
- CdrCross updated:
-
- - Adds the ability for cloning consoles to read and write record lists to the circuit board, and provides a template for giving other machines local circuit board memory.
-
- Cebutris updated:
-
- - Hugs of the North Star! Get them from the arcades (if you're lucky) and hug your friends at INCREDIBLE hihg speeds!
- - Tea Aspera now properly contains tea powder
- - Breasts no longer lactate by default, lactation is now a preference
-
- Chayse updated:
-
- - Changed the Warden's compact combat shotgun to instead be a regular combat shotgun with a foldable stock and penalties for being folded.
- - Assorted space-worthy helmets can now act as masks for internals.
- - Internals code can now check any item with the ALLOWSINTERNALS flag through the GET_INTERNAL_SLOTS define. For now this only checks head and mask slots, since those are the most realistically speaking usable ones.
- - Medbay doors can now be opened by anyone from the inside without having to press the exit button.
- - Borgs now have the necessary dexterity to unbuckle people from themselves and from bucklable objects.
- - Fixes the Trek Uniform/Suit worn icons
- - AIs can now once more talk through holopads successfully
-
- Code-Cygnet updated:
-
- - Added new things - Mind trait, alcohol reagent, chemical reagent, drink sprite and recipe.
- - added commander_and_chief sprite to drinks.dmi
-
- Coolgat3 updated:
-
- - Changed player number checks to 20 from 24 for cult and clockcult, also made nukeops 28 required players instead of 30.
- - Changed enemy minimum age from 14 to 7
- - Added the code for the semen donut and made it craftable
- - Added the donut sprites
- - Made the sec and warden berret offer as much protection like the helmet
- - Added berets for all the heads.
- - Added sprites for the berets.
- - Coded the berets to spawn in appropiate lockers.
- - Raised the ripley's movement speed and lights range by 1, also lowered its armor to compensate.
- - Added combat gloves sprite
- - Added said sprite
- - added combat boots sprite
-
- Coolgat3 / Avunia updated:
-
- - Made kindle put the target into stamcrit, which makes it an actually working, useful stun.
- - Added a stamina loss modifier to the vanguard spell which makes the user's stamina drain at a way slower rate. This doesn't make them immune to tasers, but it takes a few hits to actually get them to fall down.
- - Made it so that clock culties don't start with a chameleon suit. Instead they start with an engineer suit which is pretty much the same sprite and looks. If this is not perfect, then I am willing to make a slightly more brass-colored version of the engineer suit sprite and call it a ratvarian engineer jumpsuit.
- - Increased the cost of vanguard, as it is now a spell that works somewhat like adrenals, minus the move speed, making your stamina drain really slow and making you unable to get knocked onto the ground by just a single taser shot.
- - Lowered the charge time of kindle, reason being that you can usually have only one active spell on you, or two at max if you decide to run two slabs, but the fact that kindle silences people for such a small amount of time makes up for it, in my opinion.
- - Figured out that the consoles and their warp function actually work with the current code. The thing that makes them not work is when the gamemode is ran on debug mode, without the required players to actually support it. It also breaks the ark timer which is stuck on -1 seconds until activation. Whenever the gamemode starts properly, like any other gamemode, with player checks and all, everything seems to work just fine.
-
- CydiaButt13 updated:
-
- - Lamp Plushie to loadout
- - added plushie_lamp to plush icons
- - added Lamp Plush to loadout and icons and items
-
- EgoSumStultus updated:
-
- - Fixed blood chiller's inhand
- - FIXED SHIELF
- - fixed magpistol magazine sprites
- - Added the Femur Breaker
- - Adds male AI vox.
-
- EmeraldSundisk updated:
-
- - Adds a gun range to Box Station
- - Provides some extra power grid connections
- - Sunglasses and Earmuffs removed from the Warden's Office - they can be found at the range instead
- - Rearranges a few objects within the prison as to accommodate the new gun range
- - Adds a mass driver to Delta Station's chapel
- - Adds a second means of entry into the chapel
- - Slightly expands the chapel to make room for the driver, slight adjustment to air systems
- - Clears a path in the station exterior for the mass driver to work properly
- - Nearby maintenance loot has been relocated to accommodate the chapel expansion, surrounding area has been "cleaned up" somewhat
- - CentCom has noticed the lack of coffins in Delta Station's chapel and provided some, but in exchange for reducing the chapel morgue's capacity.
- - Fixed a maintenance door the chaplain should have been able to open.
- - Fixes space areas outside the driver removal: CentCom Defense Analysts have ordered the maintenance hatch to the Mass Driver room be removed citing "security concerns".
- - Increases the number of plots to 9 (from 5)
- - Additional lighting placed directly outside the garden
- - Cleans up the area to reflect use. Moves the seed extractor to a more central location
- - Relocates the seed packs on botany's counter to the garden removal: Removes wooden barricades outside the garden
- - Renames "Abandoned Garden" area designation to "Maintenance Garden", but does not replace the icon in Dream Maker
- - Expands the chapel mass driver room to make it easier to use
- - Rearranges the chapel backroom so there are now six coffins and burial garments roundstart
- - Cleans up the Janitor's office
- - Readjusts the station exterior so mass-driven coffins (hopefully) have less friction
- - Adds a fan to the chapel driver
- - The Janitor missed a few spots around the newly renovated Maintenance Garden
- - Readjusts positioning of Delta's QM keycard device
- - Cleaned up a few spots I missed in #9356, particularly around the janitor's office
- - Adds some potted plants around Box Station
- - The tile mentioned in #9409 should now be radiation-free.
-
- Fermi updated:
-
- - Fixes tiny runaway decimals in reagents system.
- - SDGF: Fixes infinite clones.
- - fixed an angery PR
-
- Fermis updated:
-
- - Added a panda simplemob
- - fixes empathy exploit.
- - Added the secbat, a box to hold it and the ability to dispense it from the SecTech vendor.
- - Adds 3 new music tracks.
- - tweaked Neurotoxin
- - added more depth to Neurotoxin
- - fixed the inability to create Neurotoxin
- - fixes fermichem reactions for tiny volumes work
- - makes quantisation level for chemistry finer
- - re-enables femichem explosions in grenades.
- - adds nuance to the SDGF and hatmium explosions.
- - Fixes analyse function on ChemMasters to correctly display purity.
- - Fixes the custom transfer for buffer to beaker button.
- - Debug option: Generate Wikichems
- - graft synthtissue surgery, new reagent synthtissue
- - neurine fixes brain objs merge: combines fermichem's lung damage with tg's
- - on_mob_dead(), bitflags and CHECK_MULTIPLE_BITFIELDS
- - refactored fermichem vars, moved impure chems into their own reagents subtype
- - Fixes small residues of chems that won't go away!
- - tweaked beaker health and allows use of syringes/droppers on chem_heaters
- - added a sound for when beakers take temperature damage.
- - added some icons for melting beakers
- - refactored how beakers take damage
- - fixes how beakers would only take one instance of damage on pH damage
- - fixes Janitor grenades.
- - fixes reaction mechanics at low volumes
- - stops reactions constantly bubbling on the edge of reaction temperature
- - stops small amount reactions from occurring, and prevents disappearing tiny numbers
- - Reduced minimum reaction volume from 1 to 0.01
- - cleaned up Fermichem
- - Adds Jacqueline the Pumpqueen and her familiar Bartholomew for the spooky season
- - Adds a giggle
- - Adds cauldron, Jacq and Jacq o lanterns, and a costume for halloween! mapedit: adds a new landmark so Bartholomew can spawn somewhere sensible.
- - fixes food reactions and explosion runtimes,
- - fixes the too much yes problem
- - Heart, Tongue and stomach regen.
- - lung damage threshholds.
- - Graft synthtissue
- - Skeleton's burning for no reason
- - Organ freezing handling.
- - Fixes chemistry books to point to the right wiki, and keeps tg's just in case
- - Changes top right wiki button location to go to both wikis
- - fixed Jacq's fondness for the AI
-
- Ghom updated:
-
- - minor clean up on hydroponics reagent containers.
- - fixes the perpetual lack of moisture that has affected genitalia descriptions since, like, forever.
- - implements the arousal state for mammary glands.
-
- Ghommie updated:
-
- - Fixes many possible situations of null icons for cit races' bodyparts.
- - Removes duplicate slimepeople' sprites.
- - Purges that draw_citadel_parts().
- - Fixes ISINRANGE_EX using the wrong relational operator.
- - The kindle status effect stun duration now properly proportional to the owner's remaining health.
- - Clockwork cult's kindle now affects silicons.
- - Cyborg mounted disablers/tasers/lasers now slowly self-recharge off the cyborg user's power cell instead of draining from it directly.
- - Borg rechargers now properly recharge the borg module's energy guns.
- - Prevents a couple more special/mounted guns from being preserved on cryo
- - Halved borg energy guns self-recharge delay and increased their cell capacity by 3/4
- - Fixes chemical patches always checking the suit slot even if the targetted limb was the head.
- - Skeleton, nightmare and golem races are once again available to get chemical patches applied onto.
- - Adds two cartons of space milk to the space skellie pirates cutter's fridge.
- - Refactored implants to not be located inside mobs codewise, akin to organs.
- - Fixed gps tracking implants.
- - Fixed item not being dumped out of storage implants onto the owner's turf upon removal.
- - Fixes cult potentially stalling if the target is erased from existence without being sacced.
- - Nukes the stunprod's 3 seconds delay.
- - Fixes teleprods.
- - Stops pulls of resting mobs breaking off whenever you swap turfs with someone else because of crawling delays.
- - fixes IAA.
- - EMPs now flick off stunbatons, they can be turned back on immediately by the user anyway.
- - Stunbatons now very slowly consume charge whilst kept on, at a rate of 4/1000th of a standard batoning charge cost per tick.
- - Softened up the charge cost checks to stop the above update from practically reducing the maximum uses of a stun baton by one. Now, should the remaining charge be lower than the hit cost, the resulting stun will be be proportional to the remaining charge divided by the hitcost, within a limit under which the stun batoning just won't happen.
- - Buffs condensed capsaicin, a yet another feature previously dunked by stam combat.
- - speeds up pepper spray puffs.
- - Buffed krav maga leg sweep stun and stamina damage. On the other hand, it's now unable to be used on already lying targets.
- - fixes eyestabbing people with cutlery while being a pacifist.
- - Reduces goonchat lag from being blasted by pellets and bullets repeatedly whilst wearing armor by properly removing the armor protection texts this times.
- - also reduced the size of armor protection messages in general. they clog up the chat box.
- - Fixes stunbatons icon not properly updating on cell removal and insertion.
- - Allows lower charge cells to be used with stun batons, and thus single use crapshots batons.
- - Adds in a 7 seconds delay to the jackhammer dismantling a superheated clockwork wall.
- - escape pods emergency suits storage can now be busted open by emags or excessive damage.
- - Fixes alt click bypassing the escape pods' suits storage lock.
- - Fixes emags wasting charges on un-emaggable & co stuff.
- - Ported some radials code updates.
- - Ported the RCL wiring menu and a comfier RCD interface.
- - A milder combat stance message will show up if the user switch combat mode on while on help intent.
- - Properly rewords the extinguisher's instructions on how to empty it on the floor since it was changed to be a screwdriver action instead of Alt Click a while ago.
- - Reskinnable PDAs. A related game preference.
- - Refactoring the pda, pda painter, obj reskinning and chameleon pda a bit to support this feature.
- - more PDA sprites and ported reskins.
- - turned virtual reality into a component datum, which is then applied to spawned virtual mobs. This fixes mob transformations (such as wabbajack and monkeyizing) breaking the previously hardcoded behaviour and trapping you in VR, also enabling a more concrete virtual reality inception experience.
- - Fixes power cells being unable to be rigged. Also prevents them from starting processing on init if they don't self recharge.
- - Fixes many, little or otherwise, issues with the stunbaton status refactor.
- - The sacrificial target icon will now display onto the cult objective ui alert once again.
- - Stopping borgs from sprinting into negative cell charge.
- - The default amount of z-levels reserved specifically for space ruin generation has been increased from 1 to 2
- - Moving some tablecrafting recipes to the appropriate categories: Kitty ears and lizard cloche hats to "clothing"; Hot dogs to "Sandwichs"; Cuban carb, fish and chips and fish fingers to "Fish".
- - Fixes the not-a-sandwich recipe being M.I.A.
- - Adding in peanuts, peanut butter, peanut butter toasts and sandwiches, and the PB&J sandwich. The peanuts contain a little bit of extractable cooking oil (similarly to soy beans) and can be microwaved or dried in a drying rack to make roasted peanuts, which can be mixed in a all-in-one-grinder for peanut butter, required to make those sandwiches.
- - Buffed wizard and artificier's Magic Missile, wizard and xeno queen's Repulse and juggernaut's Gauntlet Echo.
- - Fixes flashlights being unable to be used for rudimentary eyes and mouth exams.
- - Adds in a grey jumpsuit to the loadout choices, restricted to Assistants.
- - Fixes CWC construct shells being visible as ghost role to latejoiners.
- - new sprites for the flechette gun, its magazines and the toy ray gun
- - Merges the end-of-shift and its shuttle autocall announcements into one.
- - Prevents the end-of-shift shuttle from being recalled (even if to no avail).
- - Fixes being able to teleport papers to your location with TK.
- - Fixed some monkey-code shenanigeans making items sometimes disappear from pickpocketing.
- - New sprites for the some pda cartridges.
- - The crew monitor's entry for the Quartermaster will now appear bolded, while HoP's will be of the same color of the service/unknown/other jobs.
- - emergency pods' storage will now properly work.
- - The PDA skin preference will now properly save up.
- - Changed the default PDA icon var to match the default PDA skin preference.
- - Fixing the `(pointless) badassary` category appearing between the `dangerous and conspicious` and `stealthy and inconspicious` categories.
- - Combat gloves plus now properly use the combat gloves sprite.
- - Fixes the space ninja's energy netting.
- - Adding one pAI to the wizard shuttle and ERT prep room
- - Fixes the rocket launcher being unreloadable.
- - Buffed its accuracy a bit.
- - Replaced the grenade launcher emagged minesweeper loot with the rocket launcher like it was originally supposed to be.
- - Tweaked the :b: emoji.
- - Rubber Toolboxes.
- - Porting in two bar signs: Cyber Sylph's and Meow Mix.
- - Fixing stamina damage melee weaponry being unusable by pacifists, and still damaging objects and triggering electrified grilles when thrown.
- - refactored underwears to allow custom color preferences, instead of manually colored sprites.
- - The aforementioned manually colored pieces. Some of your char preferences may have been resetted as result.
- - More underwear choices, including: Bowling shirts, long johns, a tank top, fishnets, more bee socks, bee t-shirt and bee boxers (original PR for the latter three by nemvar from /tg/station).
- - random bodies will now have random underwear again.
- - Dressers will now properly change undergarment again.
- - Toned down many species' female chest sprites to fit the smaller cups.
- - Fixed some body parts sprites inconsistencies, such as the W/E female and male chest sprites being the same in some species, and jellypeople's legs being one tile off on W/E
- - Fixing baklava pies a bit.
- - Sweaters now cover groins too.
- - Improved the zelus flask to be more viable for bottle smashing than the average barman's selection.
- - Very slight bottle smashing code clean up, stupid const vars.
- - Fixes krav maga gloves, wizard spells knockdowns.
- - Added in an alert pop up to the cult convertees, on top of the older "click here to become a blood cultist" chat message.
- - The convertee's screen will now flash red to fit in the aforementioned message's fluff.
- - Made said message less verbose.
- - Towels. Crafted with 3 sheets of cloth, they can be worn on head, suit and belt slots even without uniform, or laid flat on the floor. Sprites from Baystation and Aurora Station.
- - You can combat mode right click people while wielding rags and towels to pat out their flames (to no use for rags) or otherwise drying them out.
- - toned down the stamina costs of some of the bulkier weapons.
- - repathed hypereutactic blades to be a subtype of dual sabers. Way less copypasta.
- - Fixing CX Shredder guns not accepting standard flechette mags.
- - Fixing missing magpistol magazines icon states.
- - sort of overhauled darkmode/lightmode to /vg/station's, also reincluding the pre-existing black'n'white theme.
- - Fixed LOOC color, fixed .userlove and .love span classes being a bit too blurry on dark mode.
- - The syndicate base's bathroom is now fitted with a shower, and a special towel.
- - Fixed many issues with towels.
- - The dry people off with rags/towels action can only be done if the object is NOT moist with reagents now. Also cleans banana creaming.
- - Towels deal more damage while soaked with reagents.
- - You can now squeeze rags/towels with Alt-Click.
- - deleted an old and crappier towel sprite that got in the way.
- - Fixes Pubby's disposal conveyor belts and lack of a second lawyer spawner.
- - Cleaned up the absolute state of the arousal module.
- - refactored exhibitionism into a quirk.
- - arousal states won't persist after death.
- - Fixes testicles size adjective thing.
- - undergarments toggling now works instead of just making underwear disappear and not come back.
- - The "Always visible" genitals setting will now display them above clothes.
- - combat pushes will now properly stop targets from using firearms, and will disarm the firearm if performed a second time, and also slow down people by 15%, and won't push people on tables blocked by shutters or other dense object anymore.
- - Fixes CHECK_BITFIELD macro.
- - Fixes hypovials being unable to transfer out liquids or be refilled by large dispensers like water tanks.
- - Fixes chem-masters machineries not dispensing newly made pills inside loaded in pill bottles.
- - Stunswords now fit in the captain's sabre sheat.
- - reworked ninja's stealth mode. Increased invisibility, but engaging in combat, attacking or throwing things, bumping people will temporarily lower it.
- - Ninja shoes are even stealthier.
- - cleaned up some 2014 tier processing code horror.
- - the oxyloss fullscreen overlays now also take in consideration 1/5 of the user stamina loss.
- - When you're jogging, you will only slip on water if you have more than 20% staminaloss, for real this time.
- - Different cuffs now come with different worn overlays instead of a generic one.
- - High luminosity eyes can now be properly deactivated and won't illuminate your surroundings again until turned back on.
- - Fixes freshly cloned people starting with undershirts. Fixes random characters possibly rolling with undergarments of the opposite gender (Doesn't affect preferences' freedom of choice).
- - MRE menu 3 has cuban nachos instead of a chili now.
- - Removed the illustration overlay from MREs, looks pretty weird otherwise.
- - MRE menu 4, vegetarian.
- - fixes a few bad touchs on combat mode pushing.
- - Fixes clock cult Abscond scripture not dragging pulled mobs into Reebe. Also fixes blood cult tele runes teleporting you from the source turf to the source turf.
- - fixes clock cult mass recall.
- - Fixes underwear colors a bit.
- - Fixes Blood Cult conversion prompts
- - Removes an obnoxious temporary overlay var.
- - colorable socks can be colored again.
- - Fixed undergarments color preferences resetting each round.
- - Fixed a few dozen suits' body coverage inconsistencies. These changes shouldn't affect armor and utility vests for most.
- - Fixed clown shoes and work boots.
- - Fixed some overlay bug that happens when legcuffed and then handcuffed.
- - Slowed down police baton and tele baton speed by 75%, should be still be faster than the legacy speed (2 seconds) by 0.6 seconds. Telescopic batons' stamina cost per swing is now on par with police batons, ergo more expensive.
- - Fixed undershirts n socks colors prefs.
- - You can now alt-click to rotate machinery such as the tachyon-droppler array or emitters again.
- - Sofas can't be wielded and transformed back into plain chairs anymore.
- - Enables emojis for PDA messages.
- - Removes revenant blight's shabby toxin damage in favor of mood maluses, and a dangerous necropolis curse if not cured in time. Remember
- - Blood cult altar, forge and archives now use radial menus.
- - Fixed some machineries' UIs.
- - blood and clock cultists messages from metabolizing
- - Fixed advanced medical scanners borg upgrades.
- - Fixes certain borg upgrades being unapplicable on dogborg counterparts of the target cyborg type.
- - Fixed people being shovable hrough windows, windoors and the such.
- - You can now shove people into disposal bins.
- - refactored altdisarm(), ergo the "shoving people around" proc.
- - war ops is now lowpop friendly and doesn't require roughly 54 starting players anymore.
- - Singularity beacons now also moderately increases the odds meteor waves, while lowering their estimeed arrival countdown.
- - non-alphanumeric graffiti decals will no longer display as "letter".
- - Nerfs cyborg disabler and its internal power cell to hold 25 disabler beam shots rather than 43/44, just like a normal disabler.
- - Adds some missing species_traits for cloth, clockwork and cult golems.
- - Added towel linen bins, found in dormitory restrooms. Also enhanced the bedsheet bins found in some stations' dormitories
- - Resprited bedsheet bins in 3/4 perspective
- - Made SDGF ghost poll message less verbose, made the experimental cloner's complaint with the former, and added ghost poll ignore options for both.
- - fixing some related onmob sprites issues with the above accessory.
- - Teleprods work on non-carbons mobs now.
- - Fixed tracking implant teleport issues.
- - Increased stunbatons power cell depletion rate when left on by 50%.
- - Gorlex Marauders are pleased to announce non-slip grooves were given to their .50 sniper rifles, and thus shouldn't accidentally flop on the floor like pocket spaghettis whenever taken out of a bag anymore.
- - Silicons can now operate teleporter, medical and security records console from a distance again.
- - Fixed custom say emotes conflict with drunk memes.
- - Fixes identity transfer (envy knife, changeling transformation, making a vr avatar) not copying digitigrade legs.
- - Fixes temporary transformation sting triggering heart attacks on heartless humans.
- - Fixed mobs folded inside bluespace bodybags getting their clothing and items deleted when passing through a recycler.
- - The alien-bursting-from-your-thorax and the xeno "hud" embryo stage images will now properly delete them once the embryo egg lifecycle is complete.
- - Fixed artificier lesser magic missile.
- - Phantom thief masks will now fancy your combat mode yet again.
- - Fixed gulag teleporter stripping the user of stuff it really shouldn't (like storage implant bags).
- - fixing cydonian armor a bit.
- - Resprited wooden and critter crates.
- - Improved the Cyber Sylph' good yet cumbersome bar sign a little.
- - Cyborgs can now use camera consoles on the edge of their widescreen. These consoles are also TK friendly now.
- - Updated gang dominator sprites.
- - Miner borgs can again have installed PKA mods.
- - Fixed invisible blackberry n strawberry chocolate cake slices.
- - Nuke ops / adminbus combat mechs will no longer spawn with tracking beacons.
- - Arcade machine directional sprites.
- - lowered the arcade's random plush / other prizes ratio from 1 : 2.5 circa to 1 : 5. Dehydratated carps and the awakened plush can not be achieved this way anymore.
- - Added armrests overlays to sofas and tweaked their sprites a little.
- - Fixed dogborg sleepers. Just don't tell me what is exactly fixed, cause I don't want to find out.
- - Buffed the deep space familiar gorilla against runtimes.
- - Updated ratvarian computer sprites.
- - Fixed storage implant transplant.
- - Refactored how Jacqueen teleportation destination is selected, preventing them from teleporting on off-station holopads.
-
- Ghommie && Kevinz000 updated:
-
- - Lichdom and necromantic stone skeletons are now of the spaceproof kind too.
- - skeletons now also like dairy products.
- - Halloween roundstart skeletons and zombies are no more spaceproof.
- - You can choose to set your species to zombie or skeleton through the pride mirror yet again, Alas they are not of the spaceproof kind either.
-
- Ghommie (Credits to Kmc2000 for the original PR) updated:
-
- - Porting in MRE boxes from Yogstation. But be careful, eating possibly expired MREs found in maintenance comes with an unrealistically large (actually small) chance of food poisoning. Otherwise just bail out and order actually safe-to-eat MREs from cargo for 2000 credits.
-
- Ghommie (Original PR by Dennok) updated:
-
- - Now areas_in_z get areas spawned by templates and blueprints.
-
- Ghommie (Original PR by Dreamweaver) updated:
-
- - Nanotrasen has received word of a high-tech research facility that may contain advancements in bluespace-based research. Any crew members who become aware of its whereabouts are to report it to CentCom immediately and are restricted from sharing said info.
- - The turf reservation system now dynamically creates new z levels if the current reserved levels are full.
-
- Ghommie (Original PR by JJRcop) updated:
-
- - Ports in more emojis, including : flushed :
-
- Ghommie (Original PR by LaKiller8) updated:
-
- - Goonchat options should now save properly.
-
- Ghommie (Original PR by Vile Beggar) updated:
-
- - Warden now has an added drill hat in his locker. You can change the loudness setting of it by using a screwdriver on it. Use wirecutters on it for a surprise.
-
- Ghommie (Original PR by coiax) updated:
-
- - atom/var/container_type has been moved into datum/reagents/var/reagents_holder_flags. There should be no visible changes to effects.
-
- Ghommie (Original PR by nemvar) updated:
-
- - Botanists can now get beeplushies (or cultivator and bucket) as an heirloom.
- - Clowns and mimes will now properly pick either a can of paint or their brand as heirloom now.
-
- Ghommie (Original PR by tralezab) updated:
-
- - Fixes an issue with spontaneous appendicitis picking incompatible mob biotypes.
-
- Ghommie (Original PRs by Tortellini Tony and BuffEngineering) updated:
-
- - E-cigs will continue to display their setting after being emagged.
- - Vapes now come out of the mouth. fix Fixes an E-cig initialize() runtime.
-
- Ghommie (Original PRs by nemvar and Rowell) updated:
-
- - Added beekini bras and panties, thigh-high and knee-high bee socks.
-
- Ghommie (by Arkatos) updated:
-
- - Fixed an issue with a Lizardwine drink crafting, where a final product would contain unwated 100u of Ethanol.
-
- Ghommie (by Floyd / Qustinnus, Arathian) updated:
-
- - The robotocist now has robe to show his love for toasters
-
- Ghommie (by nemvar) updated:
-
- - Dwarfs are now more robust.
-
- Ghommie (original PR by 4dplanner) updated:
-
- - thrown objects (but not mobs) no longer hit the thrower
- - mirror shield rebound no longer depends on the original thrower's momentum
-
- Ghommie (original PR by 81Denton, kriskog and nemvar) updated:
-
- - Sleepers now show a message if players try to unscrew the maintenance hatch while they're occupied or open. Fixed typos in sleeper/organ harvester messages.
- - Sleepers and dna scanners can now be pried open with crowbars.
- - You can open and close sleepers and dna scanners by alt-clicking them.
- - The scanner's hatch now must be closed (on top of being unoccupied), just like sleepers, before being screwdriverable. This fixes a tricky door stuck issue with the machine.
-
- Ghommie (original PR by AffectedArc07 and Shazbot) updated:
-
- - Added 8 new sock styles
-
- Ghommie (original PR by AffectedArc07) updated:
-
- - Religion is now a globalvar instead of being a subsystem for some reason
-
- Ghommie (original PR by AnturK) updated:
-
- - Supermatter now melt walls if it finds itself in one.
-
- Ghommie (original PR by Anturk) updated:
-
- - Recipe for fabled secret sauce can now be found in the deepest reaches of space.
-
- Ghommie (original PR by Barhandar updated:
-
- - Pumpkin meteors on Halloween now replace catastrophic meteor waves, instead of ALL OF THEM.
-
- Ghommie (original PR by CrazyClown12) updated:
-
- - The chloral hydrate inside of the sleepy pen is no longer slower acting than chloral hydrate made in chemistry.
- - The chloral hydrate inside of cookies synthesised by emagged borgs is no longer slower acting than chloral hydrate made in chemistry.
- - Slight tirizene buff.
- - Delayed chloral hydrate
-
- Ghommie (original PR by Denton) updated:
-
- - Nanotrasen has started shipping more types of bedsheets to its stations.
- - Added in Runtime, Pirate and Gondola bedsheets. The second one can also be found in some pirate ships, while the last can be crafted from gondola hides.
- - You can no longer reveal the 'illegal tech' research node by deconstructing .357 speedloaders, riot dart boxes, syndicate cigarettes, syndicate playing cards or syndicate balloons.
-
- Ghommie (original PR by Mickyan) updated:
-
- - Fixed being unable to smother people using the damp rag
-
- Ghommie (original PR by MrDoomBringer) updated:
-
- - morgues have had their proton packs removed and as such no longer suck in ghosts on closing.
-
- Ghommie (original PR by MrDoomBringer, AnturK and YPOQ) updated:
-
- - Explosions will no longer damage wizards in rod form, the supermatter monitoring radio and megafauna GPS.
- - Supplypods no longer detonate their contents.
- - Fixed silicon items (e.g. cyborg modules) being destroyed by explosion epicenters.
-
- Ghommie (original PR by Naksu) updated:
-
- - get_area() is now a define rather than a proc.
-
- Ghommie (original PR by Nicjh) updated:
-
- - Abductor console's select disguise option now uses a radial
-
- Ghommie (original PR by ShizCalev) updated:
-
- - Pineapple haters/lovers will get/no longer get pineapple pizzas respectively from infinite pizza boxes.
- - As a non-human mob, hovering your cursor over an inventory slot while holding an object in your active hand shouldn't runtime now.
-
- Ghommie (original PR by Skoglol) updated:
-
- - New helper proc for alt-click turf listing, bypasses any interaction overrides.
- - Ghosts and revenants now use the new proc.
- - Ghosts can no longer toggleopen sleepers, adjust skateboard speed or close laptops
- - Revenant can now alt-click turf to list contents.
- - Revenant now slightly less nosy, use shift click to examine.
- - Alt-clicking the same turf again no longer closes the turf listing tab.
- - Reduced ventcrawl lag greatly.
- - Mining bags will no longer drop ore into backpack.
- - Mining bags in backpack no longer interferes with other mining bags.
- - Fixes some storage size circumventions.
- - Moved machine and computer frames below objects, parts are now always on top.
- - Moved structures (chairs, closets, windows, cult altars etc etc) below objects.
- - Moves mineral doors to airlock layers
- - morgue/crematorium trays' layers shouldn't overlap bodybags' anymore.
-
- Ghommie (original PR by SpaceManiac) updated:
-
- - Disassembling a chem dispenser for the first time will no longer always yield a fully-charged cell.
-
- Ghommie (original PR by Swindly) updated:
-
- - Arm-mounted implants that contain more than one item use a radial menu instead of a list menu.
-
- Ghommie (original PR by Tlaltecuhtli) updated:
-
- - Other people's clothes burning no longer spam you
-
- Ghommie (original PR by XDTM) updated:
-
- - Reagents now stop their passive effects (for example, stun immunity) if the liver stops working while they're active.
-
- Ghommie (original PR by YPOQ) updated:
-
- - Fixing roffle waffle, mushroom halluginogen and some invalid reagents.
- - Fixes clockwork armor not actually having armor.
-
- Ghommie (original PR by cacogen) updated:
-
- - The font size of all text in the chat window now scales
- - High volume (megaphone/head of staff headset) is a slightly smaller
- - Admins have slightly larger OOC text
-
- Ghommie (original PR by coiax) updated:
-
- - Randomly coloured gloves and randomly coloured glowsticks now have slightly different typepaths, but otherwise function the same.
- - The Squeak subsystem has been renamed to Minor Mapping.
-
- Ghommie (original PR by duckay) updated:
-
- - Added better names and descriptions for blueshirt officer gear.
- - Added the above gear to the premium selection of the sectech
-
- Ghommie (original PR by harmonyn) updated:
-
- - Resisting out of bucklecuffs takes more/less time depending on the handcuffs you used, i.e., fake handcuffs will not bucklecuff someone for ages.
- - fake handcuffs shouldn't no longer demoralize restrained criminals scums.
-
- Ghommie (original PR by monster860) updated:
-
- - fixes advanced proccall
-
- Ghommie (original PR by mrhugo13 on tgstation13) updated:
-
- - The Syndicate has decided to equip their Syndicate leaders operative (Aswell as their clown counterparts) with the new Combat Glove Plus! The new Combat Glove Plus does everything the old boring Combat Gloves does but with the added extra of learning Krav Maga upon wearing them, any other Syndicate operative who wants to get in on the action will have to pay 5tc.
-
- Ghommie (original PR by nemvar) updated:
-
- - Some drinks have new icons or slightly altered icons. In particular Wizz Fizz, Bug Spray, Jack Rose, Champagne and Applejack.
-
- Ghommie (original PR by ninjanomnom) updated:
-
- - Orbiting is a little more aggressive about staying in orbit. The wisp as a result now correctly follows you over shuttle moves.
- - Gaps between sounds in some looping sound effects should no longer happen as much under heavy server lag.
-
- Ghommie (original PR by variableundefined) updated:
-
- - Cancel button to assault pod destination selector.
-
- Ghommie (original PR by wesoda25) updated:
-
- - disembowelment no longer works on mobs that aren't dead or in critical condition
-
- Ghommie (original PRs by Akrilla, Arkatos and Denton) updated:
-
- - Sprays cans have a cap on how dark you can make objects. Art is uneffected.
- - Fixed a bug where you could get cyborg spraycans via pyrite extracts.
- - Added an infinite spraycan for admins to spawn.
-
- Ghommie (original PRs by Denton and Skoglol) updated:
-
- - Reorganized the syndicate uplinks. Items are now mostly alphabetical, some misplaced items moved to more fitting categories. Bundles, random item and TC have been moved into a new category called "Bundles and Telecrystals". Gloves of the North Star and Box of Throwing Weapons have been moved to Conspicuous and Dangerous Weapons. Combat Gloves Plus have been moved to Stealthy and Inconspicuous Weapons. Moved all implants into the Implants category.
- - Added a new category to the uplink: Grenades and Explosives.
-
- Ghommie (original PRs by Floyd/Qustinnus, optimumtact, Denton and coiax) updated:
-
- - You can now select what your pills will look like when making pills from the Chem Master
- - Red pills can make you think.
-
- Ghommie (original PRs by Jujumatic and PKPenguin321, respectively) updated:
-
- - Minesweeper Arcade machines. The higher the difficulty setting, the better the prizes will be.
- - Also keep your eye out for another new (and rare) arcade game!
-
- Ghommie (original PRs by Kmc2000 and actioninja) updated:
-
- - Added darkmode! You can opt-in to this by clicking the new toggle darkmode button just beside the settings one.
- - Byond members will now have a new setting for their Antag OOC color, instead of using their OOC one. (Antag OOC still locked under admin discretion though)
- - Default black'n'white windows style.
-
- Ghommie (original PRs by Mickyan, Anturk, ShizCalev, nemvar and Naksu) updated:
-
- - After rigorous mandatory art training for the crew, many new graffiti styles are now available
- - Cleaned up some crayon and spraycan code for futureproofing.
- - Spraypainting blast doors no longer makes them see-through.
- - Paint remover now works on blast doors and the like.
- - Most objects can now be colored using a spray can.
- - Added visible message to spraying objects and windows.
- - Colored lights now shine in different colours.
- - Removed individual buttons text in crayon/spraycan UI, speeding it up.
- - Text mode buffer is actually visible in the UI.
- - Last letter of a text mode buffer no longer rotates out to be replaced with "a", allowing the text mode to be used for individual symbols.
-
- Ghommie (original PRs by Naksu and XDTM) updated:
-
- - Transferring quirks now properly removes the roundstart trait from the person losing the quirk.
- - Roundstart traits no longer block the removal of other sources of that trait.
- - status traits are now a datum var, the accessors are now defines rather than functions.
-
- Ghommie (original PRs by Naksu and coiax, loser) updated:
-
- - Cleaned up saycode
- - Taking mutadone while having the communication disorder brain trauma will no longer spam your chat with messages.
- - IPCs now come with a subtype of robotic tongue without the omnilingual ability, instead of innately having robotic voice spans.
-
- Ghommie (original PRs by Nichlas0010 and ShizCalev) updated:
-
- - AI core display screen can now be set in character preferences.
- - AI core display screen will now be restore when revived.
- - Corrected some inconsistent capitalization in the player preferences screen.
- - Readded some forgotten AI sprites.
- - Fixed Hades AI death animation not playing.
- - the AI icon-selection menu now uses a radial.
- - Added in the death icon_states for the "TechDemon" AI screen.
-
- Ghommie (original PRs by ShizCalev and bobbahbrown) updated:
-
- - Headsets now dynamically show in their description how to speak on any channels they can use when held or worn.
- - Radio channels names and keys now use defines.
- - The head arrival announcement will now be broadcast to the supply for the quartermaster.
-
- Ghommie (original PRs by ShizCalev) updated:
-
- - Fixed a bug that allowed you to teleport an ID in your possession to a PDA anywhere ingame.
- - Fixed an exploit allowing you to steal ID's/pens from PDA's not in your possession.
- - Fixed an exploit allowing you unlimited control of a PDA's interface even if it wasn't near you/in your possession.
- - Fixed Pride Mirror exploits.
- - Corgi collars can now be removed!
- - Updated the corgi & parrot inventory panels to use the same formatting as other mobs
- - Fixed corgi inventory panels not closing properly.
- - Fixed the parrot inventory panel not closing properly if you're not able to interact with it.
-
- Ghommie (original PRs by ShizCalev, MrDoombringer, AnturK, bgobandit, 81Denton and actioninja) updated:
-
- - Failsafe codes for uplinks are now available for purchase.
- - Nuke Ops now have the ability to purchase a usable RPG, the PML-9, as well as a couple different types of rockets for it. you can also suicide rocket jump with them!
- - Improved Uplink item descriptions and formatting.
-
- Ghommie (original PRs by ShizCalev, coiax and Tlaltecuhtli) updated:
-
- - Caks will no longer override the bonus reagents provided in a donut when frosting them.
- - Caks can no longer create frosted frosted jelly donuts.
- - Jelly donuts will no longer lose their vitamins when they're frosted.
- - Fixed chaos donuts potentially doubling the amount of reagents added when microwaved with something else.
- - Donuts now always contain 1 sprinkles as was stated on the wiki. Frosted donuts have a chance at adding an extra sprinkle.
- - Improved the code for ensuring that security members enjoy donuts and security-themed alcoholic drinks.
- - neurotoxin doesnt insta stun but gives you limb paralysis overtime and heart attacks if it stays in for too long and it is also alcholic
- - beepsky smash now summons imaginary beepskys that deal stamina damage instead of outright stunning
-
- Ghommie (original PRs by Time-Green and Qustinnus) updated:
-
- - loot crates can't explode after unlocking anymore
- - jumping into loot crates no longers causes them to go boom
- - You can now deconstruct abandoned crates with a welder without making them go boom. After unlocking them, of course.
-
- Ghommie (original PRs by Tlaltecuhtli and nicbn) updated:
-
- - alt click to eject beakers from chem masters + chem dispensers + grinders + chem heaters
- - hit chem master + chem dispenser + chem heaters with a beaker and if its loaded with another it swaps em
- - All-In-One Blender UI uses a radial menu now. You can see the contents and reagents by examining.
-
- Ghommie (original PRs by XDTM, 4dplanner, nemvar and, yes, myself) updated:
-
- - Merged tinfoil hat kind of protection into the anti_magic component.
- - Tinfoil hats can also be warped up from excessive dampening of mindray/though control/psicotronic anomalies, or by simply being microwaved in an oven, and become useless.
- - Immortality Talisman and Paranormal Hardsuit helmets now come with tinfoil protection too (minus the paranoia and limited charges).
- - Genetics/Slime/Alien Telepathy and Slime Link are now stopped by tinfoil protection.
-
- Ghommie (original PRs by XDTM, optimumtact, Nichlas0010 and monster860) updated:
-
- - Added Quantum Keycards, devices that can link to a quantum pad, and can be used on any other quantum pad to teleport to its linked pad. spellchecking: Renamed "Bluespace Teleportation Tech" tech node to "Bluespace Travel".
- - Moved roasting sticks from the "Bluespace Travel" to "Practical Bluespace".
- - Spraying holy water on tiles will now prevent cult-based teleportation from using them as a destination point.
- - Quantum, wormhole and magic teleportation is no longer disrupted by bags of holding.
- - You are now also blocked from teleporting IN to no-teleport areas, not just out of them.
- - Quantum teleportation now makes pretty rainbow sparks instead of the normal ones.
- - Non-bluespace teleportation (spells etc.) no longer makes sparks.
- - Fixed teleportation deleting mob spawners like golem shells and ashwalker eggs.
-
- Ghommie (original PRs by carshalash, GranpaWalton, BebeYoshi & Hexmaniacosanna, Fire Chance, Ordonis, Krysonism and OnlineGirlfriend) updated:
-
- - Reduced booze power of Mead, Red Mead, and Irish Cream.
- - Increased booze power of Grappa.
- - Added a new premium drink to the soda machine called "Grey Bull" which gives temporary shock resistance
- - A new drink called Blank Paper was added to the bar menu, it was made by a mime and it represents a new start.
- - Adds a variety of fine alcoholic beverages for discerning patrons of the bar: Wizz Fizz, Bug Spray, Champagne, Applejack, Jack Rose, Turbo, Old Timer, Rubberneck, Duplex, Trappist Beer, Blazaam and Planet Cracker!
- - Also more nonalcoholic drinks: Cream Soda, Lemonade and Red Queen.
- - Packs of a novel artificial sweetener have been added to the kitchen vendor.
- - Bottles of trappist beer and champagne are now available in the premium seection of the booze-o-mat.
- - Juicing parsnips now yields parsnip juice.
- - Maintenance peaches.
- - Grape soda now cools you down like other sodas.
- - tweaked the Arnold Palmer recipe, it now uses lemonade.
- - Added new drink, bottle, vomit and peach can sprites.
-
- Ghommie (original PRs by grandpawalton and Mickyan) updated:
-
- - the contents on the smartfridge icon now change depending on how many items it contains
- - opening the maintenance panel of smartfridges now correctly updates the icon
- - Screwing a disk compartmentalizer no longer makes it look like a smartfridge.
-
- Ghommie (original PRs by nicbn and coiax) updated:
-
- - Microwave UI uses a radial menu now. You can see the contents by examining.
- - Microwaves have a single wire accessible when open, the activation wire. When cut, the microwave will no longer function, when pulsed, the microwave will turn on.
- - Stabilized dark purple extracts now cook items in your hands, rather than dropping the cooked item on the floor.
-
- Ghommie (original PRs by ninjanomnom and nemvar) updated:
-
- - Trays now scatter their contents when used for attacks, like they are supposed to.
-
- Ghommie (original PRs by ninjanomnom, coiax, yoyobatty) updated:
-
- - Fixed slaughter demons not getting a speed boost when exiting a pool of blood. Fixed slaughter demon giblets not being visible.
-
- Ghommie (original PRs by subject217, AarontheIdiot, pireamaineach, Gousaid67 and SouDescolado) updated:
-
- - Removed plasmamen species speedmod in favor of a slowdown for envirosuits.
- - Nanotrasen has began deploying departementalized enviro plasmasuits to the station! plasmamens can now benefit from some of the bonuses aswell as the color pattern of their job, while allowing others to easily determine their profession!
- - Benevolent Nanotrasen makes gulag available for everyone! (Plasmamen retain their equipment and don't die.)
- - Removes code that theoretically limits plasmamen from being clowns and mimes, but actually doesn't.
-
- Ghommie (original PRs by zeroisthebiggay, AnturK, MrDoomBringer, Cobby, ATHATH, optimumtact, GranpaWalton, Skoglol) updated:
-
- - Blob overminds, sentient diseases, etc. can no longer dump out boxes. Sorry gamers.
- - Sentient Disease now has almost all symptoms at its disposal.
- - Adding single-symptom disease abilities is super easy now.
- - Sentient Disease can now hear (not sure if this was a bug or intentional).
- - Sentient Disease is a linguist and knows all languages. Still cannot speak.
- - Gives Sentient Diseases a medical hud to observe their victims further with.
- - Fixes and moves around some on_stage_change() and Start()-related things for virus symptoms and (sentient) diseases.
- - The inorganic biology symptom should work properly now when bought by a sentient disease.
- - Oxyloss icon no-longer shows up when someone has the self respiration symptom
- - The self respiration now makes you not contract diseases through the air and not breathe in smoke
- - Sentient diseases can no longer pick two cures that react and disappear when eaten.
- - Sentient disease cures are now consistently harder, will only pick cures from tier 6 and up.
- - Disease cures should now stay the same for all infected mobs.
- - The regenerative coma symptom has a new resistance 4 threshold effect! Said threshold effect will give hosts of the symptom's virus the TRAIT_STABLECRIT trait if its threshold is met.
- - An obscure, probably never reported before bug that may or may not exist involving sentient diseases and the self-respiration symptom should be fixed now (if it even existed in the first place).
- - The cooldown time between each removal or addition of a symptom for sentient diseases has been brought down from an agonizingly long 2 minutes to a more reasonable 1 minute.
-
- Ghommie (original pr by Dennok on tgstation) updated:
-
- - Now you don't lose your pulled thing on the z level edge.
-
- GrayRachnid updated:
-
- - Added windoors to all the flaps on delta.
- - rebalanced k9dogborgs
-
- Hatterhat updated:
-
- - Magnetic pistols now fit in boot pockets - jackboots, workboots, etc.
- - literally every pistol subtype fits in shoes now. go wild.
-
- Hippie Circuit Port updated:
-
- - Added all Atmospheric Circuits
- - Added the ability to color data disks
- - Added Selection and Storage Examiner Circuits
- - Added Smoke, Extinguisher, and Beaker Connector Circuits
- - Added Inserter, Renamer, Redescriber, and Repaint Circuits
- - Added MMI Tank and pAI Connector Circuits (The possibilities are endless!)
-
- Improving and Balancing Cyborgs updated:
-
- - Added Crew Pinpointer to Security Borg
- - Added Crew Monitor to Medical Borg
- - Added Crew Pinpointer to MediHound Borg
- - Made the Disabler_Cooler compatible with both Security Borg and K9 Borg
- - Changed the Warning Text upon selecting Security or K9 module
-
- ItzGabby updated:
-
- - Bat Species parts for more leeway for character customization.
- - Alphabetized decor wing selection window in character creator for simplicity.
-
- JTGSZ updated:
-
- - Added one more gang boss slot bringing total to 4 from 3
- - Fixed Gang Boss being able to be deconverted
- - Gave Qualifies_for_Rank Check back its checks in job controller.
- - Optional species based clothing restrictions
- - Gang Dominator excessive wall check tweaked to 25 open turfs
- - Gang Dominator no longer functions off-station.
- - Adds more control over species based offsets.
- - qualifies_for_rank now checks latejoin menu
- - Added Halloween Dwarves, for Halloween... Yep.
- - Can flip pipes once more.
- - barricade girder walls use PlaceOnTop instead of new
-
- Linzolle updated:
-
- - ability to quickly max sensors
- - atmos helmet visual bug
- - supply display are now properly on the wall
- - consistency in hop and cap berets
- - slime people now enjoy eating toxic food and it will not disgust them
- - hos trenchcloak now properly has a sprite on digi characters
- - duplicate definition of hos and sec skirts
- - Krav Maga leg sweep now works properly.
- - shoes can have a different icon used for their item and mob icons
- - combat gloves plus having no mob icon
- - inhands sprite for rainbow knife
- - colour of highlight on the regular knife when held in the right hand
- - mining shuttle console can now be printed after computer consoles have been researched
- - can now carry people on your back by aggressive grabbing them while they are laying down and then dragging their sprite onto yours.
- - dragging people who are prone is now much slower, and carrying them will allow you to move faster at the cost of taking 5 seconds to lift them up onto your back.
- - pacifists can now aggressive grab (cannot table slam people though)
- - blood on your body floating a bit to your right if you're a taur
- - some suits having no icon on tauric characters
- - front facing CMO hardsuit icon for naga taurs
- - colour of medical cross on CMO hardsuit for taurs
- - taur body and jumpsuit showing through mining suits
- - all chaplain suits can hold the same items in suit storage
- - improvement to organisation for chaplain suits
- - blood halberd not going back to 17 force after unwielding
- - unnecessary 's at the end of blood rites healing
- - QoL to blood rites, examine the ritual aura to view how many blood charges are left
- - surgery cleanup
- - dissection available round-start
- - better dissection surgeries from RnD, gives more points
- - abductors can now see what glands do
- - antagonist abductors now have a surgeon trait that teaches them every surgery rather than having it just check if they're an abductor
- - muscled veins surgery
- - having one of your hands used up if you fireman carry but the person being carried dismounts any way other than you dropping them
- - Four colour variants of ankle coverings. Select them on the loadout screen.
- - ankle coverings
- - allows for shoes that don't cover your feet to be taken into account for footstep sound effects and glass shards
- - Tend Wounds surgery. Heal in the field, with better healing the more damage the patient has.
- - Reconstruction replaced by Tend Wounds
- - made Revival more accessible, more viable alternative to cloning.
- - advanced surgery tools can't perform lobectomy or coronary bypass
- - Decorative and insect wings can now be coloured individually, similar to horns.
- - people getting assigned wings if their savefile is old.
- - wings that take the hair colour. Unnecessary if you can just set the colour.
- - Cannot make horns pure black. Trying to do so will set it to a default value.
- - decorative angel wings being invisible
- - abductors now actually work
- - abductor scientist has their own greet message now
- - unable to read paper on airlocks
- - ai can see paper (still just shows stars)
- - Target head and throw a hat at someone to toss it onto their head, knocking whatever they're wearing off if they are wearing a hat. Some headgear can't be knocked off this way.
-
- MediHound updated:
-
- - Made Cyborgs be affected by Ion Storm Law Changes like AIs
-
- MrJWhit updated:
-
- - rebalance melee stamloss
-
- Multicam Config updated:
-
- - removed whether or not the stuff for multicam was checking the useless var and instead now checks the CONFIG_GET flag.
- - Admins now have a verb in the Server tab to turn AI multicam on and off.
-
- Naksu updated:
-
- - default radiation insulation is now handled by atom vars rather than a component, components can still be used.
- - squeezed a little bit more perf out of atmos
-
- Nero1024 updated:
-
- - Bare feet will now make the correct footstep sounds.
- - Other mobs will make the correct footstep sounds.
- - Crawling/dragging sounds for downed/incapacitated mobs
-
- Onule & Nemvar (ported by Ghommie) updated:
-
- Original by Citinited, port by Sishen1542 updated:
-
- - You can now use an airlock electronics on a locker to add a lock, and can screwdriver an unlocked locker to remove its lock.
- - You can now remove the locks on broken or emagged lockers.
- - Removing the lock from a personal locker now wipes that locker's ID details.
- - Broken lockers have had their appearance changed.
-
- Owai-Seek updated:
-
- - custodial cruiser cargo crate
- - removed light replacer from power designs and moved to misc designs
- - added pimpin ride to custodial locator
- - added additional items to janibelt whitelist
- - made plant DNA manipulator unwrenchable
- - reduced janitor premium supply costs
- - fixed them strawberries
- - false codpiece
- - crocin/camphor bottles
- - updated kinkmate item list
-
- PersianXerxes updated:
-
- - Adds the clockwork_warp_allowed flag to the Captain's Office area, set to FALSE the same way it is for the chapel and armory.
- - Relocates cult catwalks outside the Reebe dressing room.
-
- Poojawa updated:
-
- - Digitigrade legs are now able to wear shoes and look fancy, Uniforms to come.
- - Xenos are only digitigrade now, mammals and aquatics have the option.
- - Fire Alarms are visible in low light situations
- - fixed vore prefs saving inconsistently, new characters might have a previous slot's prefs tacked on.
- - fixed mammals not having the option for digilegs. Sprites are fucky until body-part related sprites are done.
- - improved vore sound responsiveness to preference choices.
- - removed morphine from Medihound sleeper chemical list
- - fixed preference setting being broken
- - Medihound sleepers are Initialized properly, and icons update correctly now on eject
- - Air alarm All clear color changed from green to blue
- - APCs are harder to destroy.
- - Added Digitigrade versions of everything appliciable in suit.dmi
- - Snowflake Icons weren't modified, and were given NO_MUTANTRACE_VARIATION
- - naga and quad Taurs literally don't freeze their ass off in space anymore.
- - Digitigrade legs will toggle on/off properly on character menue
- - The misleading "normal" has been removed from species options
- - Added sanity checks to emag usage
- - fixed vtech, but it still doesn't work because of overriding jog/sprint mechanics from combat reworks.
- - Puppy jaws properly store if you're emagged, they are also toggle-able for stealth like the tongue.
- - Digitigrade legs should properly fucking update for the last fucking time. Fucking snowflake code. refractor: Got rid of snowflake sechound cuffs, gave them normal zipties like regular secborgs.
- - dogborg sleepers actually extinguish people who are on fire, in case you don't have time to lick them out.
- - Taur suits should fix themselves properly when worn by other people.
- - Added the Yogs/Oracle ported latejoin menu
- - All markings, tails, ears, and snouts for Citadel races are color matrixed!
- - all markings are on a per-limb basis, including Digitigrade legs!
- - a bunch of tails were blessed with tail wagging sprites, Fish, Sharks, Fennecs, Wahs, raccoons, and others.
- - Tiger markings + tail added, skunk tails improved via sprites from Virgo
- - tweaked some sprites to look better, but they absolutely could use a few extra passes for quality
- - HumanScissors in the Tools folder will permit anyone to contribute matrix'd markings to the sprite sheet, however Mam_markings is very, very full. Be careful.
- - Character preview was both optimized for taurs and bad-touched for better updating. I don't know if it'll be bad, but hey its better.
- - Added Dark Medihound and Pup Dozer from Virgo
- - Clone pods no longer announce the name of the clone
- - fixed flavor text appearing when your face is hidden but you're not an Unknown
- - Tauric suits now apply an (placeholder) blood overlay, as well as their shield overlay.
- - Ashwalkers now have lungs. They cannot breath station air without suffocation effects, but are completely fine on their homeworld.
- - Carbon mobs now have a maximum tolerance to oxygen of 50kPa.
- - Deluxe synthetic lungs have a very high bonus to O2 tolerance.
- - Digitigrade legs returned to normal, since digi leg markings overlay them anyway.
- - commented out lizard mam_snout entries, because too many abominations
- - Vore Panel restored to have various interactions available again. Semi-untested but should work as advertised.
- - Vore Panel has more feedback.
- - is_wet var to bellies, toggled in the panel, will remove flesh sounding struggles and the internal loop. JSON version updated.
- - Feeding var. You will need to enable feeding to recieve any feed vore actions, but you can now feed yourself to mobs that have this set. TODO, Dogborg sleeper feeding.
- - vore mode button now required to be enabled to perform vore actions. It's the mouth icon!
- - Ash Drake vore fixed for actual reals this time
- - Mobs shouldn't spam the released contents announcement anymore on qdel or death. Only if triggered
- - Hostile mob code now properly ignores targets in bellies
- - Your belly can quietly growl if you're starving now.
- - Normal blood splattering isn't offset due to tauric mode
- - Added plasma man suit icons for taurs
- - Added bee butt for insects to have stripes
- - adjusted random spawn sprite accessories, humans won't be demi by default and lizard/mammal spawns will randomly get digitigrade legs
- - sprite adjustments for tentacles, as well as a misspelling.
- - Humans once again use ears and tail_human, as intended. This is to prevent garish randomness
- - istype for species is actually correct and usable now, it'll be a factor for monkey form expansions.
- - Hair functions are de-gendered and more easily selectable now.
- - Slimes can *wag, select markings and snouts, and yes it works.
- - Slimepeople extra parts now respect their hair_alpha in terms of being somewhat see-through. it shouldn't stand out as badly now!
- - Hunger noises are now toggled per character
- - Ashwalker den is habitable by ashwalkers again
- - Medical belts now have overlays! Now you can see if a belt is useful or just flatout empty.
- - fixed hypo MK IIs not being able to be put on medical belts
- - fixed Navy officer uniforms that failed to spawn
- - Loadout items will be forcefully added to backpacks or at your feet instead of left behind at title screen
- - hypospray kits hold 12 now, but only vials and sprays themselves
- - labcoats can carry MK II hyposprays on them now.
- - Vore Mobs are a thing now, not just ash drakes
- - Removed hunger sound stuff. never taking requests from Coolgat3 ever again. refractor: Simple Mobs use the same system regular human mobs do, itjustworks.png
- - Character Window settings unsnowflaked and normalized. I have no fucking clue how to make them work with taurs still tho, sorry.
- - added rotating background images for better clarity and contrast than just SOLID FUCKING BLACK. Images from Virgo/Polaris/Eris
- - Defib users automatically stop pulling when they attempt to perform a defib shock
- - added muzzled varients of space helmets and full masks
- - added knight_grey to taur suits, all paranormal ERT now have tauric versions enabled
- - Lava knights have digitigrade and tauric versions now
- - Added a glass version of the gas mask, because it was in the files and looked nice. does everything regular ones do except make you an unknown
- - Added custom species names! Examining people will now display their species name unless they're an Unknown or have their face hidden. like flavor text. Set it in your character window!
- - changed how health scanners print messages, wrapping it in msg for one to_chat instead of printing every line to_chat.
- - Discord bot will now report when a round ends and give the vague news ticker that a sister-station would have received for the game mode and result of the round.
- - fixed medical hardsuit overlay issue. I thought it was going to work well but fuck byond.
- - None body markings shouldn't give rgb hell, but it also should reset properly anyway. ree.
- - Sorted some sprites to better sooth my byond icon limit anxiety.
- - Box Cryopods expanded to 6 public. Permabrig cryo fixed.
- - Delta Cryopods expanded to 6 public. Permabrig cryo fixed.
- - MetaStation Crypods expanded to 6 public, relocated above sparring ring. Permabrig cryo fixed
- - PubbyStation gained one more cryopod, Permabrig's cryo fixed.
- - Omega given one more crypod as well.
- - Gulag was given a cryopod.
- - Box and Meta's cryo rooms are now a new room entirely.
- - Added erect states for all phallic bodyparts
- - YOUR DICK ACTUALLY STANDS UP NOW, YOU'RE WELCOME.
- - skintone locked genitals match the new skintone colorations.
- - added two new vaginal types and descriptions.
- - fixed borg defib runtimes
- - fixed heart attacks being nonlethal
- - Ported Oracle's cloning set up, you're now visible like cryo when being cloned, though it's a mystery until you have skin on your meat puppet existance
- - Recyclers are unable to destroy the indestructible any longer.
- - Kiara's toy sabre now actually is the correct item + icon states
- - Generic armor for taurs fixed, there isn't actually any sprites for 'em, so. Full sprites overlay over bodies, but I really can't be bothered to do all the offset fixes otherwise.
- - Large maps have had a patient room transformed into micro chemistry stations with nothing else in them. They've been labelled 'Apothecary' rooms and are accessible by doctors.
- - females now have female defined sprites
- - Slime legs have had their excess pixels adjusted
- - Mammal normal legs are more in line with human legs now
- - fixed species like abductors and golems getting the fat tiddy or pingas
- - Atmos and Station alerts should be more alerting.
- - Added visible and hidden testicles
- - Added multi-boob support. Now you can have two or three pairs of breasts.
- - fixed missing vagina and breast sprites
- - fixed prosthetic hands being invisible
- - male foxes exist again
- - female chest markings improved from being too dark in comparison to their other colors, blending better
- - Markings behave better on non-organic limbs.
- - tweaked the name of Sublter to distinguish its use
- - Gave a hint for vore posting.
- - Readded Ninja speech modifications with their mask
- - Pacifists can eat people for heal belly or noisy. Digestive modes are auto-swapped to noisy
- - Added an underwear toggle button under 'Object' tab
- - Genitals now layer under underwear. Hide these if they're too obnoxious.
- - Added digitigrade socks of all known ones anyway.
- - tweaked the Genital character creation layout to look better
- - fixed having balls/womb when you don't have the linked organ at character creation
- - fixed being able to squeeze semen directly from your balls. Probably.
- - NT Newscasters have had repeated reports of gang activity and are now looking into it.
- - NT Psykers keep mumbling about last words of someone who died. Somehow they even have a newsletter for this...
- - Gangster greeting messages are a batch message rather than 5 laggy to_chats
- - RCL now show what color is currently in use
- - Added RGB blood effects, know whose blood this is by color!
- - Added Synthetics blood, and a machine that produces it. A universal donor for medical to heal people with. Make it via medical protolathe!
- - With hearts, slimepeople shouldn't die from the effects of not having a heart.
- - Plasma vessels from xenomorphs will restore blood if you're on resin.
- - Poly's speech now echos to the chat bot.
- - Added new wings to Insects and separated fluff from old ones, they're Insect's new body markings now without being per-limb (for now).
- - Horns are now available to mammals, and they have their own color.
- - Legs are no longer a binary hack code, but actually something that can be changed. Framework for tauric adaptations.
- - Purged Modular Citadel's sprite_accessories.
- - improved the quality of a number of sprites.
- - Moths are now all insects. Avians and Aquatics are all anthromorphics. Just as planned.
- - Anthromorphs can choose their preferred gibbing meat. I guess. Snowflakes are weird.
- - Additional Gentlemen names.
- - Medical huds are now calibrated for Radioactive wavelengths.
- - Engineering equipment, blue space, and common storage containers are radiation protected
- - fixed suit storage not cleaning radiation levels of everything stuffed into them.
- - QM is able to hire/fire people to their department now.
- - cryopod UI isn't complete shit anymore
- - Cryopods purge silicon gear more efficiently now. Same with ghosts.
- - Med Sprays are now more aligned with patch mechanics
- - Chemistry is encouraged to be more varied in their healing, as well as careful in its application
- - Active NPC priority set much higher priority for the MC, with the intent on making NPC combat more interesting
- - Clarified access descriptions of some jobs
- - fixed missing deco wing states
- - fixed a few things related to vore content
-
- Putnam3145 updated:
-
- - Bottles in PanD.E.M.I.C 2200 can now be replaced with an inhand bottle directly
- - Ejecting a bottle from the PanD.E.M.I.C 2200 puts it directly into the user's hand
- - Alt-clicking the PanD.E.M.I.C 2200 ejects the current bottle
- - neural nanites only work/drain if you have brain damage or traumas the nanites can fix
- - Pod people can no longer get fat from standing in the light
- - PanD.E.M.I.C 2200 now ejects onto itself instead of onto user if user's hands are full
- - Added configs for a bunch of Dynamic rule parameters.
- - Added defaults for all the configs (WIP).
- - Added dynamic midround/latejoin antag injection to the config.
- - Made starlight condensation not kill slime people.
- - Added not-killing-slime-people to the transmission threshold of plasma fixation and radioactive resonance.
- - Made the clone scanner lock while it's scanning.
-
- R3dtail updated:
-
- - Added 16 saltprimaryobject items Added 4 saltsecondarysubject items
- - Added a new carpet. Red! Also added said carpet to the Premium Carpet crate from the cargo supply console. Trilby said she'd take care of the crafting recipe.
-
- Raptorizer updated:
-
- - Doubled peach spawn rate
- - tweaked numbers/variables
- - rebalanced numbers/variables
- - removed unneeded code
-
- Seris02 updated:
-
- - Abductor Replication Lab ruin and advanced tools
- - Added looc hotkey
- - made the autoprocess button relevant
- - changes so that spooktober starts earlier
- - fixed the dark blue lum major effect
-
- Sirich96 and Dennok (ported by Ghommie) updated:
-
- - Added new Teleporter Station sprites
- - Added teleport station calibration animation.
-
- Sishen1542 updated:
-
- - Pentetic Jelly, new chemical made through mixing 1:1 slime jelly and pentetic acid.
- - Anatomic panacea now gives pent jelly instead of pent acid. Medbeams now have TRUE tox healing to heal TOXINLOVER as well.
- - Changed bible heal proc, halving the healed damage and increasing brain damage 5x in exchange for a much wider array of items to protect you from it.
- - Moved around some chems from emag list into upgrades.
- - Added some fun chems to dispensers.
- - Gave dispensers old tg functionality.
- - Leather, cardboard, bronze & bone golems!
- - Bone hurting juice and interactions with plasmamen, skeletons & bone golems!
- - Ported addition of new CAS cards.
- - Ported a fix for CAS.
- - Added the ability to alter your genitalia as a slimeperson more than addition/removal.
- - fixed genitalia removal proc in alter form.
- - Ported the inability for non-station AI to interact with station z-level.
- - HoS mains can now peacefully sleep in their office.
- - Podpeople now have customization options.
- - Removed the human check for cult conversion of captain/chaplain minds.
- - Roundstart carbon jetpacks now have full_speed FALSE.
- - Adds plasteel to medical and security techfabs.
- - Added public autolathes to all maps.
- - density = 0
- - hugboxing mining loot
- - ling blade now has 40 armor pen
- - fun
- - bad stuff
- - mech bad
- - rebalances strained muscles
- - added in the assistant response team
- - fixed up access on the centcom hangar button
- - storage tweaks for belt briefcase
- - codersprite for belt briefcase
- - added pharaoh gear to chaplain vendor
- - fixed typos in pharaoh items
- - made laser minigun not shitcode and also craftable
- - added new fire sounds for the laser minigun
- - holy lasrifle, hypertool, divine lightblade, and blessed baseball bat. Four new holy weapons!
- - stamina and force tweaks for most holy weapons.
- - prayer beads no longer deconvert after a 10 second timer, now just inject holy water for delayed effect
- - cultist runes are now destroyed with a bible or a null rod
- - bo-staff now functions as a nerfed sleepy carp staff
- - fixed kevinz code to add in non-null rod child items as holy weapons
- - fixing chems for strained muscles
- - narsie no longer asks for consent
- - removed reflect from divine lightblade
- - teleporting a locker is bad
-
- Sishen1542, original by @Tlaltecuhtli updated:
-
- - alt clicking the emitter now rotates it instead of only flipping
-
- Sishen1542, original by @zxaber updated:
-
- - Utility mechs no longer automatically get beacons.
- - Tracking beacons no longer delete themselves when EMPing a mech, and instead have a ten-second cooldown in-between EMPs. They also now do heavy EMP damage rather than light.
- - Mechs that take EMP damage lose the use of their weapons and equipment temporarily. Movement and abilities are not effected.
- - Mechs taking EMP damage no longer roll for a random malfunction.
-
- Sishen1542, original by Arkatos updated:
-
- - Action buttons can now be dragged onto each other to swap places
-
- Sishen1542, original by NewSta updated:
-
- - updated the miasma canister sprites
-
- Sishen1542, original by Skoglol updated:
-
- - Heaters/freezers now support ctrl clicking to turn on and alt clicking to min/max target temperature.
-
- Sishen1542, original by XDTM updated:
-
- - Using the wrong surgery tool during surgery no longer attacks the patient, if on help or disarm intent.
- - Surgery steps are now shown in detail only to the surgeon and anyone standing adjacent to them; the patient and people watching from further away get a more vague/ambiguous description.
-
- Skoglol updated:
-
- - You can now alt click storage (bags, boxes, etc) to open it.
-
- Skully) updated:
-
- - Nudity Permit, a completely invisible uniform that still has pockets and such, to loadout options. It is more or less a direct port from the RP server.
-
- SkullyRoberts updated:
-
- - Penis autosurgeon as rare maint loot.
-
- TerraGS / Skoglol updated:
-
- - Adds toggleable light and blinking charge indicator to kinetic crusher
- - Kinetic crusher can now be one-hand carried. You'll still need two hand to use it.
-
- Thalpy updated:
-
- - fixes message_admins in SDZF
- - Alkaline buffer recipe so people don't get grumpy and expanded the pH range
- - fixes buffers
- - fixes broken compiler because a var changed name
- - impure travis var anger
- - Added the ability to dispense smartdarts from the chemmaster.
- - Tweaks medolier amd chembags to allow quickpickups of smartdarts, lets the latter soak in beakers (on the floor)
- - fixed rounding errors with smartdart mixes.
- - added modified smartdartgun icon.
- - 1. Kev asked that there were no antag datums used, so that's been changed. 2. Tricks can no longer turn someone into a dullahan, instead you have to spend candies to get that. I felt it was too mean to turn people into that, I didn't realise you couldn't revert it. 3. Barth will no longer as for impossible items. 4. Barth will no longer as for the same item multiple times. 5. Barth will now accept broader things, rather than asking for something, when meaning something specific. 6. Jacq will now no longer poof off the z level. 7. Jacq will (hopefully) stop spooking the AI by teleporting into there 8. Jacq will now try to teleport to a location with someone nearby. 9. Barth will tell you where Jacq is currently when you speak to him. 10. You can trade 2 candies for a Jacq Tracq (tm) 11. Jacq should stop getting mad and cover the station in gas when killed. 12. Fixed Jacq not singing (the link died). 13. Slightly changed wording so that people will hopefully get to know her. 14. Jacq no longer disappears when you're getting to know her.
-
- Toriate updated:
-
- - All regular crates are now 3/4ths ToriCrates iamgeadd: Unused plastic crate sprite added
- - Blood freezer crates now have unique sprites.
- - RPD now has inhands
- - New sprites for RCDs and RPDs, inhands included
- - Updated the sprites of all the regular crates
-
- Trilbyspaceclone updated:
-
- - cakes!
- - Made some sprites! -Love them really came out well
- - new economics
- - cargo and robotics relationships
- - unbalanced something
- - fixed a maybe oversight
- - Fun
- - costs of suit voucher
- - Unblances miner vender
- - spare cheaper brute kit
- - harm from hentie
- - rebalanced goliaths stun to be less auto death
- - Armor to blob shields
- - block weaken state to 70% from 75%
- - restores the deathriplys missing armor
- - new lockable colalr
- - armor
- - missing hopes and dreams
- - orgized the weapon file to be more cat brain friendly
- - This means sprite right?
- - Many engi flags on non-engi things
- - changed some code to be organized at a glance
- - 25% < --- 50% For NPC blocking bullshit ided: Yes
- - mag gun uses cells
- - kev things their to op
- - syndicate phobia
- - other phobia's
- - laser carbine
- - makes collars only locked via key
- - charging
- - Combat inducers for COMBAT!
- - made it look nice
- - golden swag boxes
- - Crafting suitcases
- - more bountys
- - Nitryl bounty
- - better stocks
- - more evil blood fluff text
- - Added more mime names
- - replaces a sink with a autolathen
- - 2 -> 3
- - MASON SUIT!
- - adds the sec jetpack to sec hardsuit storge
- - Added a few jet packs to the space queens men
- - volume of jet packs
- - Bad Idea
- - bio mass meat
- - more box options
- - a lack of replaceable boxes
- - clothing needing a emag
- - 4 - > 5
- - 5->6
- - 4tc - > 2tc
- - mulligan costs 4 - > 3
- - Tuberculosis 12tc - > 8tc
- - 15 - >10
- - both bags have the same name
- - 5 - > 2
- - 3 -> 1
- - 2 < - 4
- - 1->2 and ultra
- - shield + crafting
- - hierophant movment and melee attack
- - More plushies
- - attack verbs and descs
- - bone satchles
- - rebalanced stunslugs
- - colored boxes, and more types
- - harm and such
- - item classes
- - resonators being so shitty
- - Game braking bug critical: bug fix
- - items to syndie surgery bags
- - SNOW CONES
- - carts buy-able cargo
- - selling/time to craft
- - crafting problems, and red stamp exsplote
- - gives paper work sprites that are nicer
- - origami
- - gang tower shield
- - costs of boots
- - organ box
- - Medical breifcaseses
- - New cargo crate for tech-slugs!
- - Ammo to each fitting crate
- - Cat-code
- - fixed a few typos - Again my bad
- - fixed airless place
- - baklava
- - makes uplink kits more usefull for the risk
- - Changes some files to be better
- - As all things are not
- - fixing cat code that dosnt work, my bad
- - Arcades stealing from noodles
- - rapier
- - speedy quirk
- - Ironic
- - A bunch of minor issues with xenobiology are no more!
- - I didn't code it right it in the first place
- - new nodes
- - points and node gear
- - stuff n things
- - gear harness and a conflict merg
- - Nudity permits
- - nothing
- - Donner item
- - Luna's Gauntlets
- - rebalanced lingy dingy powery gamey
- - melee and block harm
- - sprites*
- - holster doing holster things
- - Donor item
- - Joy, Happiness, Honk
- - small mix up in terms
- - Promiscuous Organs crate, pills to lewd crate and testicles to maints
- - Made unholy water healtoxinlover
- - Zelus Oil, brass flasks
- - Added new chairs
- - Bugtesting zone upgrades for easy bug/game testing
- - more cargo to cargo
- - More loadout gear
- - Poojawa power creep
- - Not my work not my credit
- - Emitter gun
- - suit storage nulling anti magic item protection
- - rebalanced steal goals restrictions
- - fixed a few misleading goals
- - ports a fix
- - oversight in benos
- - QM rooms not getting Key Aunths
- - new books/cooking
- - less bad wording in slime
- - strawbarries and such
- - amazing things like tea of catnip, catnip and plant
- - glue uplinks
- - RPDs to drones
- - Armor and such
- - flavor
- - maybe a runtime
- - chameloen clothing
- - tons of peach themed items
- - caje
- - New book - Unused
- - organized files
- - redid brass tools to look better*
- - /cursed from a item path
- - Almost all clothing and most weaponds can be sold for pocket change
- - Cargo costs of packets and selling
- - Lowered mat selling as well as most if not all bountys
- - Adds more files for easy finding/adding in packs
- - oops not being blacklisted
- - removes some cit-modular things
- - Missing sprites with bad ones
- - emag charge amount
- - Reebe QoL aka creep in gear
- - ???
- - HEY MADE THE REEBEEE WAY SMALLER - Making it less lagging hopefully
- - Surgerys and spays in bags
- - earthbloods stam regen
- - Red to Blue/Black crosses as questioned by Bhijn
- - clean bot not cleaning basic cleanables
- - new traitor bundle
- - trash
- - eye bleed :add: misstakes
- - Removed old things!
- - UI memes
- - Blue space blood bag
- - blood costs
- - Beebal and Honeybalm plants
- - Costs of crates and paperwork
- - Adds 2 more crates hacked only
- - Added two seed packets of cotten to ash walkers base
-
- Tupinambis updated:
-
- - Changes large parts of the nuclear operative base, including the addition of a new barracks where the ops spawn, a personal bedroom for the leader, the rearrangement of numerous rooms, some added fluff, a slightly more roomy bar, a larger hanger, a kitchen, and various other small changes to make the base feel just a bit more alive. This was achieved by completely redoing the base from scratch so there was room to work with, as a result potential bugs could crop, please do report them.
- - The drop pod chamber was airless. This seems like an oversight, and has been filled with air.
- - Cryo Sleepers have been added to Perma on all four maps in rotation. the bathroom windoor and window have switched places to accommodate this change.
- - You can now choose the pre-exisiting "loader" sprite as an appearance for your engineering borg.
- - A vast majority of references to humans within ion laws have been replaced with crew. AI modules have received similar treatment
- - Adds a syndicate themed emergency shuttle that costs 20000 credits, and can ONLY be purchased when the communications console is emagged. This shuttle features a fully stocked medbay with self serve sleepers, plenty of room that can fit highpop, a fully featured bridge, ballistic auto turrets, and an armory, EVA prep room, and bar, all of which are only accessible by either an agent ID or through hacking.
--EVA prep features 2 syndicate hardsuits and 3 syndicate softsuits. -Armory features 5 stetchkins with spare ammo, and 2 riot c-20r's.
-
- - Lone operatives no longer spawn with a syndicate hardsuit and a bulldog. They instead spawn with a black and red EVA suit and an extra 15 TC (40 in total) 
- - The tesla engine has been replaced with a supermatter engine, and pubby engineering has been redesigned to accommodate this change.
- - The tesla engine has been completely removed along with any related components
- - RD and R&D vents are now actually connected to the air distribution.
- - New engineering hivebot. Has a bit more health but otherwise aesthetic.
- - Oldstation no longer has an excessive amounts of hivebots within it, however the bots that remain are individually a larger threat.
- - Hivebots are now more robust, with a higher melee damage output and health.
- - Remove this ruin from the blacklist or this PR is pointless.
- - the air injectors for the SM engine waste and for toxins waste should now receive power
- - Adds a mixed clothing closet to Deltastation Dorms.
- - Adds a bottle of unstable mutagen to Botany, on account of its distance from Chemistry.
- - Omegastation should no longer have any turf with missing textures, as those spots have been replaced with playing covered in a sandy turf decal.
- - Removed all living eggs from the xeno ruin because people self antag. Honk.
- - Adds a new security level between Blue and Red (Amber). The shuttle call time at this level is 8 minutes.
- - Blue security level now has a shuttle call time of 12 minutes.
- - The security level increase/decrease texts have been modified to accommodate the change.
- - Adds a code Amber sprite for the fire alarms
- - Removed the plushes from the toy crate, giving them their own.
- - Plushes are now less likely to spawn out of arcades
- - Removes a moth plush from the game.
- - added a small fire delay (3 ticks) to automatic shotguns
- - Reduced buckshot brute damage by 20%. (12.5 -> 10 brute per pellet) (75 -> 60 brute at close range)
- - Reduced rubbershot stamina damage by 40% (25 -> 15 stamina per pellet) (150 -> 90 stamina at close range)
- - Reduced beanbag stamina damage by 12.5% (80 -> 70 stamina per shot)
- - Engivend RCDs now vend upgraded RCDs
- - Beautified and stylized the cyborg HUD sprites, animated and cleaned up some of the old, modernized APC hacking and Doomsday sprites,
- - moved cyborg language select above the radio icon, instead of above the picture icon.
-
- Twaticus & Poojawa updated:
-
- - Added new carpets from TauCetiStation!
- - More Liquid carpet chemicals, mix carpet with certain reagents to get different colors!
- - Tablets have a better means of being assembled codewise. nothing's different on player end.
-
- UntoldTactics updated:
-
- - Rewords the click here prompt given when an attempted conversion is done on an offer rune (for blood cult)
-
- UristMcAstronaut updated:
-
- - allows a pai to activate its holoform while in a pai connector without getting derped.
-
- Useroth updated:
-
- - the collars are now aware of their proper overlay sprites
- - The space hotel dorms are now properly boltable with the buttons inside.
- - Makes the booze-o-mat hacked by default. Alternative to https://github.com/Citadel-Station-13/Citadel-Station-13/pull/8350.
- - After the PR which raised the ammo capacity of said magazines, due to the code, they ended up with an invalid icon state. Fixed through changing the icon state name in the icon file.
- - Taeclowndo shoes which grant the four following abilities: - Conjuring a cream pie right into their hand. Every three seconds. - Making a banana peel appear out of thin air at the tile of the clown's choice. Every ten seconds. - Mega HoNk. A touch-ranged, very small AOE ability, with effect equal to being honked by a Honkerblast on a clown mech, with the effects halved for anyone who isn't its direct target. Every ten seconds. - Bluespace Banana Pie. You don't throw this one... not right away at least. This baby can fit an entire body inside. Good for disposal of evidence. 25 second-long action, 45 second cooldown. Also produces a "[victim's name] cream pie". The body drops out of the pie if you splat it somewhere or destroy the pie. If you eat it, it will chestburst out of you a'la monkey cube.
-It's a 14 TC item for traitor clowns and a 12 TC item for clown-ops.
- - The tentacle now directly puts the item in your hands, instead of toggling your throwing and tossing it at you. Tentacles suffer from ranged inaccuracies as if they were guns, I think it's enough of an inconvenience.
- - Makes the netting much less clunky. If there's only one target you can net while you press the button, it will just net that target instead of bringing up a list of mobs.
- - Energy nets now revive and fully heal capturees (even dead ones, after calculating points). If someone's got a scan and wants to get cloned, they can always kill themselves still.
- - Capture points are added on capture, rather than round-end, so it no longer matters whether your captures kill themselves in the holding facility or not.
- - Makes the nets a bit more sturdy. (previously it took mere two welder hits to break one)
- - Makes stungloves actually stun people (currently comparably with stunbatons, adjustable). Because electrocute_act(25, H) did fuck all, stunwise, and on top of that, people in insulated gloves were completely unaffected.
- - Reduced the stunglove electrocute_act value to 15 due to above. Could possibly be lowered further.
-
- Weblure updated:
-
- - Added the relevant Beepsky animations from TG's aibots.dmi file to Cit's aibots.dmi file.
-
- WhiteHusky updated:
-
- - Sleepers now show blood level and type.
- - Changed the styling of arousal messages to use pink-ish colors.
- - The orgasm moodlet message new-lines properly.
- - Flavor text with special characters will not get partially unescaped.
- - Canceling when setting flavor text does not clear it anymore.
- - Checking yourself shouldn't freeze the client anymore.
-
- XDTM updated:
-
- - Added the experimental dissection surgery, which can be performed once per corpse to gain techweb points.
- - Rarer specimens are more valuable, so xenos and rare species are more efficient subjects.
- - Added two new surgery procedures, under the Experimental Surgery techweb node.
- - Ligament Hook makes it so you can attach limbs manually (like skeletons) but makes dismemberment more likely as well.
- - Ligament Reinforcement prevents dismemberment, but makes limbs easier to disable through damage.
- - Golem limbs can now be disabled, although they are still undismemberable.
-
- YPOQ updated:
-
- - Stealth implants work again
-
- Yakumo Chen updated:
-
- - Made stealth implant boxes flimsier
- - Autocloning now requires tier 4 parts
- - Removes autoscan
- - Scanning people now requires someone to operate the cloning computer regardless of part level.
- - removed antimagic component from holymelon
-
- YakumoChen updated:
-
- - AEGs brought more in line with current radiation system. Try not to get EMP'd.
- - Jetpacks no longer last twice as long between air refills.
- - Reverted laser miniguns.
- - Adds beanbag slugs to the sec protolathe at round start
- - Brings shotgun ammo availability back in like between seclathe and autolathe.
-
- Zargserg updated:
-
- - Lungs maximum toxin threshold is 0.5% of the atmosphere.
- - Permanently contaminated atmosphere does not murder crew anymore.
-
- ZeroNetAlpha updated:
-
- - Cleans up autoylathe code and brings it back in line with the regular autolathe.
- - Fixes autoylathe interface not updating propperly.
- - Silicons are now consumable by scrub pups.
-
- actioninja updated:
-
- - APC UI autoupdates correctly
-
- bluespace bio bags updated:
-
- - Added bluespace bio bags and put it in the tech web, in the node applied bluespace
- - added a crappy icon for bluespace bio bags
-
- chef updated:
-
- - Added main hallway approach to monastery
- - Added Maintenance hallway approach, with some maint loot
- - moved the docking arm for the white ship
- - changed placement of some grills and windows
-
- coiax updated:
-
- - When the nuclear disk stays stationary long enough to trigger an increase for the lone op event chance, admins will be notified every five increments.
-
- dapnee updated:
-
- - Plasmaglass tables, spears, tiny plasmaglass shards
- - Plasmaglass structures now drop plasmaglass shards instead of nothing
- - Trim lines!
- - You can now make plasmaglass tables again.
-
- deathride58 updated:
-
- - When a gamemode fails pre_setup, it will now send a message in admin IRC and in ingame admin chat, instead of only being viewable in the logs.
- - Portal guns now spawn without firing pins.
- - Reduced the default/baseline nanite pool amount from 100 nanites to 25 nanites, and reduced the maximum nanite amount from 500 nanites to 125 nanites. The safety threshold was reduced from 50 nanites to 12 nanites.
- - Most of Lavaland's mobs are now on crack.
- - Blood drunk miners now move once every two ticks, rather than once every three ticks.
- - Bubblegum now has a maximum movement speed of once every three ticks. Buffed from the original value of once per 5 ticks.
- - The minimum time for the Colossus to attack again after firing a random shot is two deciseconds, Sped up from the original value of three seconds. The minimum time for the Colossus to attack again after performing a blast is now one second, with the original value being two seconds. The minimum time for it to attack again after performing its alternating shot pattern is now two seconds, original value being four seconds.
- - Ashdrakes now move once every five ticks, rather than once every ten ticks.
- - Heirophant chasers now move once every two ticks rather than three ticks by default, and the chaser cooldown has been reduced from 10 seconds to 5 seconds. The cooldown for the Heirophant's major attacks has also been sped up to 4 seconds from the original value of 6 seconds.
- - The Legion (megafauna) now moves at two ticks per second rather than three ticks. It additionally now actually moves faster while charging. The cooldown timer for it's special attacks has been reduced from 2 seconds to 1 second. Additionally, The Legion's view range has been decreased from 13 tiles to 10 tiles.
- - All megafauna now have a default view range of 4 tiles, decreased from the original of 5 tiles, and an aggro'd view range of 15 tiles, decreased from the original of 18
- - Goliaths now move once every ten ticks, sped up from the original value of 40(!!!) ticks. Additionally, their cooldown for their tentacles has been reduced from 12 seconds to 6 seconds. To compensate, their cooldown now only decreases by 5 deciseconds every time they're attacked, rather than 10 deciseconds, their melee damage has been reduced to 18 per hit from 25 per hit, and their vision range has been decreased from 5 tiles unaggroed, 9 tiles when aggroed, to 4 tiles and 7 tiles respectively. Ancient goliaths have a default attack cooldown of 8 seconds, sped up from the original value of 12 seconds.
- - Legion (the common mob) now has a cooldown of 1.5 seconds on their skull attack, sped up from the original value of 2 seconds. Additionally, their view range has been decreased from 5 tiles, 9 tiles when aggroed, to 4 tiles, 7 tiles when aggroed.
- - Stamina no longer regenerates at hyper speeds.
- - To accommodate for upstream's stamina changes, knockdown() now applies staminaloss only to the chest.
- - adjuststaminaloss() now has a new argument that allows you to specify a zone to apply staminaloss to. This defaults to the chest
- - apply_damage() is now capable of healing carbon mobs and human mobs.
- - Since the head has the same exact effects as the chest when disabled, and doesn't really make much sense to be affected by stamina, the head no longer has stamina.
- - The chest now has a stamina cap of 200 stamina due to the above.
- - Footsteps now sound mostly the same as they did before the hard sync
- - Jukeboxes now properly remove themselves from the active jukebox list when destroyed
- - Server operators and badmins can now make the server play like TG by toggling the stamina buffer on/off using the DISABLE_STAMBUFFER config option.
- - Airlock wires now work as they did prior to the hard sync
- - The thing you're currently grabbing is now taken into account when left-click disarming. Things you have grabbed now roughly have a 45% chance to be disarmed.
- - Disarm push rolls are now determined by the target's staminaloss rather than a flat number.
- - When you're in combat mode, pushing someone who isn't in combat mode is a guaranteed knockdown. Hard counter to stam regen squeezing in melee combat.
- - Failed disarm push attempts now deals light staminaloss to the target so long as both the attacker and target are standing. The total stamloss dealt to the target is random, clocking in at a very inefficient 1-5 stamloss per unsuccessful push attempt.
- - Disarm pushes now play the thudswoosh sound regardless if they're successful or not. Had it not been for copyright, I would've used L4D's melee sound.
- - Disarm push attempts are now logged
- - Autostand no longer makes you invulnerable to dropping items when being knocked down with a force greater than 80
- - You can no longer abuse an href exploit to return from the labor camp before obtaining enough points to satisfy your point goal.
- - Norko's donor item is now listed in the right category
- - The medihound sleeper now has a non-vore variant. This will be used by default. The old voracious variant will only appear if both the person being sleeper'd and the medihound have the voracious hound sleepers pref enabled. Sprites by Toriate
- - "Allow medihound sleeper" is now labelled "Voracious medihound sleepers", and is now off by default
- - AOOC no longer prints to players in the lobby
- - Human tails and human ears now save again. Humans now use mam_tail and mam_ears for their snowflake bits instead of tg's equivalent, just as they did prior to human tail and ear saving breaking
- - Disarm pushes no longer deal staminaloss to resting targets
- - You can no longer force a hard stamcritted spaceman to stand by clicking them with help intent. Get more creative if you want to torture someone that's in hard stamcrit.
- - The revolution gamemode now waits until the 20 minute mark before checking for win conditions.
- - You can no longer resist/move out of grabs while you're resting. Disarming your way out still works, though.
- - Stamina damage now has diminishing returns on people who are in hard staminacrit with the addition of a new multiplier. When you take staminaloss while in hard staminacrit, you'll be under the effects of the new multiplier, which reduces the amount of staminaloss you take from all sources of staminaloss. The diminishing returns multiplier will steadily return to 1 once you're out of staminacrit.
- - You can now scramble while resting. You can do this by dragging your spaceman onto an adjacent turf. This works even if you're in staminacrit, but the timer depends entirely on your staminaloss.
- - Fully augged cyborg people now heal stamina damage properly.
- - Job EXP is now tracked properly for all roles.
- - Nightmares and shadowpeople have had their light threshold for being considered in darkness reduced. Nightmares can no longer stand unharmed next to a light fixture during a nightshift 100% unharmed. The threshold is high enough so that APC lights on their own won't harm a nightmare, but being on the edge of a light source will.
- - The detective revolver's .38 bullets are now non-lethal again, but now require 3 shots to hard stamcrit
- - The current lethal variant of the .38 bullets can still be printed at sec protolathes.
- - You can now access ghost roles from the latejoin menu.
- - Eyeblur now scales depending on how much actual eyeblur you actually have.
- - Ebows now induce 50 drowsiness on whatever they hit.
- - Telepads have been buffed across the board. T1 parts on a launchpad still grants you a range of 15 tiles, but T4 parts now grant you a pretty large 60 tile range (up from their original 18 tile range). Briefcase launchpads were also buffed, they now have a range of 20 tiles, up from their previous laughable 8 tiles.
- - The grace period for the revolution win condition check has been reduced from 20 minutes to 10 minutes. You don't need to wait nearly as long for the round to end if no heads join in.
- - You can now select plural and neuter as your gender. They're labelled "non-binary" and "object" in the character customization menu, respectively.
- - A lot more light sources now use the same nonbinary colored lighting philosophies as flashlights and light fixtures!
- - Flashlights mounted to guns and helmets now retain the same color and power as their original light. Lavaland's caves will reflect a fluorescent blue as you shine your KA around, and sec's helmets are now capable of illuminating maint in that fancy fluorescent blue.
- - Cameras now shine a fluorescent blue when lit up by an AI
- - Glowing goo now actually glows green.
- - Candles had their power reduced from 1 to 0.8.
- - Lighters now shine a little further, and are now properly colored.
- - PDAs now shine an incandescent yellow to match their sprite.
- - Welding tools now shine an appropriate color
- - Hardhats now shine an incandescent yellow.
- - Plasmaman helmets now shine an incandescent yellow.
- - Microwaves no longer overpower literally every single light in the game, instead having a power of 0.9.
- - Borgs now have incandescent yellow lights to match their sprites
- - Bots now shine a fluorescent blue light
- - Airlock light overlays are now on the above lighting layer. This means airlock lights can actually be seen in the dark now.
- - The mob spawners list no longer leaves null entries behind when a spawner has a job description defined. The latejoin menu will no longer show ghost roles that are filled, and the spawners menu actually works again.
- - The voting system now actually tracks who voted for what. This means it's now possible to change your vote, and it's possible to see what you voted for.
- - Using help intent on someone that's in hard stamcrit will now make them heal 15 stamloss.
- - Auto fit viewport is now enabled by default for new players. One less question off the FAQ
- - The Khajiit favorite, Skooma, was added as a chemistry recipe that can be produced with cooperation between chemistry and either cargo or service. If you want to spoil the recipe for yourself, take a look at the PR for it!
- - When the shuttle leaves for centcom, a vote will be started to select the next map instead of the map being randomly chosen via biased voting methods
- - If a server operator wishes to re-enable the biased TG preference voting system, you can do so by toggling the TGSTYLE_MAPROTATION config flag on in the config.txt. Keep in mind that doing so will bring you great misfortune.
- - Cacti in lavaland now have 6u of vitfro instead of just 4u. This lessens the gap between cacti and first aid kits, the third rarest and second rarest readily available healing methods for ashwalkers, respectively.
- - the "genitals use skintone" option now appears in the character appearance menu when appropriate again.
- - Clicking your stamina bar will now show your exact stamina along with info regarding your stamina buffer
- - The bug where ghost role spawners leave null entries in glob.mob_spawners has actually been fixed
- - The Kitchen Gun (TM) is no longer invisible.
- - The majority of cult spells no longer have exclamation marks at the end of their invocations. This means they will no longer be bound to the rules of shouting. Which means sec officers will no longer be able to hear culties sacrificing the captain from the complete opposite side of the maintenance tunnel the sacrifice is happening in. However, things like EMP pulses and runeless teleportation still have the effect due to their inherent loud nature.
- - The stun blood spell now instantly causes hard stamcrit. However, to offset this, it now also only has one charge and has a higher cost.
- - The Gloves of the North Star now restore 2/3 of the stamina used up by punches when harm intent punching. With aggressive play and good stamina buffer management, this makes it entirely plausible to roughly double your stamina regeneration per mob life process tick.
- - Revs can no longer remember the name of the person who flashed them when deconverted. This brings it in-line with the other conversion antag deconversions.
- - The bug where you can sometimes get permanently stuck in stamcrit should HOPEFULLY be fixed. I'm unable to reproduce the bug myself, but let's hope.
- - The night vision trait now grants you darksight for an entire 1:1 screen, but the alpha of the lighting plane with the trait has been increased from 245 to 250 to balance it out
- - It's now actually possible to click the stamina hud button
- - The stamina hud button now displays your stamina buffer correctly
- - Bone spears now have a reach of 2 tiles.
- - You can no longer phase through solid objects via scrambling
- - The syndicate mask now works properly as intended.
- - Stamina is no longer affected by health at all.
- - You can now right-click yourself in help intent in combat mode to instantly get up from resting. This will cost stamina equal to your entire stamina buffer. Manage your stamina well, and you'll be able to shrug off a single stray golden bolt
- - The new player panel now displays your currently selected character's name
- - Flashes no longer knockdown. Instead, they deal eyeblur and have increased confusion
- - The server's tagline is now a config option. People can now stop confusing us with BR cit
- - Attack animations will now rotate your character slightly, similar to Goon.
- - Throwing items will now perform the attack animation and play a sound
- - flashlights will now make sounds when toggled on/off
- - Things in disposals will now emit sounds every single time they hit corners. This increases immersion.
- - Air alarms now actually emit the proper light color when their status is okay.
- - Backpacks and other storage items will now jiggle and squish when you interact with them, similar to the animations seen on Goon.
- - Mops no longer have a delay on their cleaning, making them an actually viable alternative to all of the janitor's other cleaning tools
- - To balance this, mops now take stamina to clean tiles. Standard mops take 5 stamina to use, while advanced mops take 2 stamina.
- - Oh and also mops make fancy new sounds and play animations when used now
- - Pump-action shotguns now take 2 stamina per pump instead of 5 stamina per pump. This also applies to bolt-action rifles, as bolt racking counts as pumping.
- - Pickpocketing items will now place them in your hands if possible
- - Combat mode is now displayed in examine text
- - Combat mode now makes a visible message when enabled if you haven't touched your combat mode button in the last ten seconds. It's done this way to avoid chat spam from those who know how to pull off stam regen squeezing.
- - All knockdown sources will now force people to be dismounted from ridden vehicles.
- - When an item is thrown, it will now be rotated and displaced.
- - Shards of glass will now be rotated when spawned.
- - Bullet casings will now be rotated when they're ejected from a gun.
- - Bottles now have random rotations and pixel offsets when smashed via throwing.
- - Picking up an item will now reset its rotation.
- - Glasses thrown onto tables by bartenders will now have their rotation reset.
- - Slime speed potions can now only increase the speed of vehicles to be on par with sprinting speed. They can no longer make a scooter roll around ten times faster than a speeding blue hedgehog.
- - Changelings will no longer recieve team objectives
- - Changelings no longer start off with hivemind communication as an innate ability. Hivemind communication now requires 1 dna point, on par with syndicate encryption keys, which are 2 TC.
- - Hivemind link now relies on hivemind communication just like the hivemind download/upload abilities.
- - It's now only possible to zoom a gun if it's in one of your hands
- - Mobs without clients no longer cause runtimes when their eyeblur updates
- - Blood tests have been added. If a changeling has a sufficient number of loud abilities, you will be able to test their blood by heating up a sample of it. However, if the changeling has a large amount of loud abilities, attempts to test their blood will have explosive results.
- - Changelings now make a very obvious noise when readapting. This is to prevent the cheese strat of simply readapting when you get caught to avoid detection.
- - The blood splatter effect that happens when you get attacked will now always make you lose blood depending on the damage you've taken. The effect now also scales with item damage, meaning tiny little papercuts will no longer be able to cause a massive blood splatter.
- - The blood reagent will now cover items and spacemen in blood when applied to objects and mobs.
- - Helmets, masks, and neck items are all now valid targets to get splattered when you get covered in blood. Groovy.
- - The temperature notification will now take into consideration both the ambient temperature and your body temperature, increasing the responsiveness of the temperature notification and making it much more realistic.
- - Shuttle transit borders are now 10 tiles wide instead of 8 tiles, hopefully repairing the immersions that get shattered by the ability to see normal space where the transit areas end.
- - Instead of transit turfs simply teleporting things to space, transit is now handled in a somewhat realistic manner. Transit turfs now act like normal space turfs, though exiting the transit area or being present in the transit area after the shuttle moves out of transit will teleport you to space and throw you in the direction the shuttle was moving in.
- - Reservation areas are now able to designate a border turf.
- - The sprint hotkey will no longer cause you to get permanently stuck sprinting if the server lags. Just tap shift again if you get stuck
- - You can now hear sounds in the real world while inside of a VR sleeper.
- - You can now make nameless characters. Nameless characters will spawn in with their name set as their job title followed by a unique five digit number. The "Name" option in the character setup menu will be replaced with a "Default designation" option for nameless characters, and the default designation will be used in place of a job title for assistants and other jobs that don't require dress codes.
- - The out-of-game round end notification is now a little more verbose. It'll now display the round type, end result of the round, and the survival rate.
- - Xenos can no longer strip items off of people to be capable of using any item in the game.
- - also, items from pockets get placed into your hands properly now
- - A mob's last words are now properly tracked and recorded on death. The first death of the round will now actually display the victim's last words on the round end screen.
- - Divine shenanigans can no longer result in someone becoming immune to staminaloss
- - Fixed body_markings in bodyparts being assigned as a list when in reality, it's a string and literally everything expects it to be a string and uses it as a string. This should mean that markings no longer have completely fucked up caches for character preview and other things.
- - Since apparently the game is literally unplayable if items are not in the exact center of a turf, the maximum pixel variance of thrown objects has been reduced by four pixels to make things a smidge more clearer for those that dont know what a turf is.
- - Bartender glasses should HOPEFULLY no longer be tilted when landing on a table. Why the fuck is after_throw called via a timer.
- - Changeling screeches now have their own unique sounds, and are much easier to recognize.
- - Most synthetic emotes are now available to humans. *ping
- - You can now merp
- - The TEG will now only produce a meaningful amount of power if the hot pipe contains gas that's actively combusting
- - Added the "add PB bypass" and "revoke PB bypass" verbs, which allow admins to let a specific ckey to bypass the panic bunker for the rest of the round
- - Jogging is no longer treated exactly the same as sprinting for water slips. When you're jogging, you will only slip on water if you have more than 20% staminaloss.
- - The atmospherics turf subsystem now has double the wait time, which should free up server processing power for other tasks.
- - The IRC now actually displays the actual survival rate
- - Bloodcult conversions are now consensual. Convertees are given a ten second timer to accept or wait out. This should drastically improve the quality of those that get converted into bloodcult.
- - All sacrifices now count as a third of a cultist for the end-game narsie summon.
- - Nameless captains will no longer proc a "Captain Captain on deck!" message. Instead, it'll be a much more boring but much more sensical "Captain on deck!" message.
- - Transit turfs on the centcom z-level now function properly again at keeping mobs within the areas defined by their boundaries.
- - The title screen is also positioned correctly again.
- - Ghost role eligibility for both event and spawner ghost roles is now affected by DNR status. If you suicide, ghost, or cryo out, you will be unable to qualify for any ghost roles
- - Cryo now applies DNR status no matter how long the round has been going on
- - Suicide is now properly admin logged as it is supposed to be. Ghosting while alive is now also logged.
- - Sparks and igniters will now actually heat areas rather than cooling them, as was intended.
- - To alleviate some potential complaints, RPDs now have a cooldown before they can create sparks, and both RPDs and emitters produce less sparks.
- - Conversion runes will now mute the victim temporarily while they're deciding whether to convert or be sacrificed.
- - Conversion runes no longer require a third cultist to sacrifice if the victim refuses conversion
- - Staminaloss targeted at the head now properly redirects to the chest.
- - Sprinting no longer takes stam when you're being pulled or when you're in zero gravity. Other sources of involuntary movement are not affected.
- - In an attempt to improve performance during highpop, mouse movements will now only call onmousemove() while a user is in combat mode
- - Ballistic projectiles are now the only projectiles capable of emitting dinks.
- - Panic bunker toggling and bypassing is now logged in admin IRC
- - OOC and LOOC now use separate toggles. You can now use LOOC while OOC is globally toggled off, and admins now have the option to toggle LOOC off separately from OOC
- - also revamped and reorganized relevant looc adminverb code
- - The endgame narsie summon rune no longer requires 24 total sacrifices, and will now properly account for cultists that surround it
- - The succumb verb is now available in the IC tab
- - Lighting now uses a linear algorithm to calculate falloff instead of an inverse-square algorithm.
- - get_hearers_in_view() now actually caches the results of view() instead of calling view() twice
- - Goonchat's JS no longer contains checks related to a completely unused message filtering function, which should improve clientside performance quite a bit
- - The storage hud now properly takes into account the viewer's view size, meaning storage items with a large amount of storage slots will properly stretch across the bottom of the screen when running in widescreen.
- - Action buttons are now able to fill the entire screen in widescreen and other weird view sizes.
- - Omegastation's job changes will no longer be included at compile time.
- - The client update portion of /mob/Login() now double-checks to make sure client.player_details exists and is of the proper type. This should hopefully fix the "cannot read null.player_details" runtimes that can spontaneously cause clients to get kicked out and forced back to the lobby.
- - You can now quickly use unequipped items on objects by simply click-dragging the item onto the object with an empty active hand. Doing so will place the item in your hand, and then use that item on the object.
- - In an attempt to improve the performance of /mob/Stat(), various time-related procs now use defines instead of being procs that call procs that call other procs that call even more procs.
- - If a living mob has vore initialized but doesnt have voreprefs initialized, then client login will force voreprefs to load.
- - Hopefully fixed paper crash 2: electric boogaloo
- - Added unomos, which is basically listmos except gas mixtures only use one single list for handling their gasses. This is a significant performance improvement that also offers a mild memory improvement under normal circumstances.
- - Locomotion circuits are now restricted to jogging speed
- - MMI circuits and pAI circuits both now have 60 complexity, up from their original 29.
- - Biogenerators now have a sane limit for production
- - Fixed a fairly huge server crash exploit
- - Shield blobs no longer become completely invulnerable to all forms of damage after reaching a """weakened""" state
- - Taken care of what appeared to have been an oversight where shield blobs don't recover their armor after becoming weakened.
- - Nerfed concatenators by limiting the amount of characters they're able to output
- - The timer for stripping an item off of a spaceman is no longer interrupted by your active held item changing. This means you no longer have to worry about filling both of your hands when you're stripping items off of someone.
- - Ported the zulie cloak and blackredgold coat donor items from RP.
- - Normal mops now only use 2 stamina to mop a tile, nerfed from their previous value of 5 stamina per tile mopped.
- - Advanced mops now only use 1 stamina to mop turfs, from their former value of 2 stam.
- - The femur breaker now uses `*scream` instead of forced speech. This means that the femur breaker will no longer spam deadchat with "AAAAAAAAAHHHHHHHHHH!!"
- - The femur breaker will now guarantee that the victim falls into crit, which will make it harder to perform torture scenes with it since the victim can just succumb.
- - Fixed another runtime in warp whistles.
- - Spamming forged packets no longer crashes the server.
- - Things that access job_preferences now explicitly access keys, which means it no longer attempts to access invalid indices and runtimes as a result.
- - The taser's electrode has been reworked. Instead of being a strong knockdown that deals a heavy amount of stamloss, it now causes a weak knockdown, applies a debilitating status effect for 5 seconds, and deals 35 stamloss on hit up to a maximum 50 total stamloss.
- - Roundstart turrets now have a nonlethal projectile that gets used when they're set to stun and the target is resting
- - Hybrid tasers now have disablers set as their default mode.
- - There is now a 1% chance for the station's announcer to be the medibot voice instead of the classic TG announcer.
- - The map config system has been expanded to allow mappers to specify the map type, announcer voice, ingame year, and how often a given map can be voted at roundend.
- - The map vote system now takes into account map playercount limits properly.
- - Examining a spaceman, and other things that use get_examine_string(), will now actually properly show when an item is blood-stained.
- - Plasmaman tongues no longer have a maxHealth of "alien", and no longer cause the organ's on_life to always runtime.
- - Shooting a simplemob no longer causes runtimes prior to the blood effect being created.
- - Removing a filter from an object that lacks filters no longer causes runtimes.
-
- deathride58 (Original PR by actioninja) updated:
-
- - Disarm pushing (combat mode right click in disarm intent) will now actually push mobs away. Knockdowns from disarm pushing are no longer rng based on the target's staminaloss. Knockdowns from disarm pushing now only happen when you push someone into another mob, a table, or a wall. Pushes will now also temporarily stop targets from using firearms, and will disarm the firearm if performed a second time. Pushes still deal staminaloss to standing targets, and won't deal a single ounce of staminaloss to resting targets.
- - You can no longer displace mobs that are in harm intent by simply walking into them. Mobs that aren't in help intent have to be disarm pushed to actually be moved.
-
- dtfe3 updated:
-
- - Increased music maxlines from 300 to 600
- - Made it so any oxygen tank can be used instead of only red ones.
- - Watcher wing Trophy's effect lasts 1 second instead of 0.5
- - Pink Panties
- - Twintails
- - Schoolgirl outfits for the loadout menu!
- - Now the fox ears are located in front of hair meaning they now behave much like cat ears, that being they are on-top of the hair layer.
-
- izzyinbox updated:
-
- - adds VoG orgasm command using words "orgasm", "cum", "squirt", "climax"
- - adds VoG dab command using words "dab" and "mood"
- - Generic dog body marking sprite
- - colormatrix dog sprites
- - lowered the player age for command jobs to 1/3 of their previous setting
- - *bark emote
-
- jtgsz updated:
-
- kappa-sama updated:
-
- - Removed racism
- - Teleporter calibration actually matters to all roundstart players
- - Slows down teleportation with the console/hub/teleporter setup if you care for your species.
- - Dedicated non-humans can now get hulk without having to become human.
- - seed
- - added obj/item/key to wallet whitelist
- - blood cult ritual daggers fit in jack/combat boots
- - voidcells can now unlock alien tech
- - rebalanced tech trees (not really)
- - hugbox (/s)
- - ashwalker spawn text now tells them "i" "c" not to leave lavaland
- - you can no longer have infinite ebows
- - kevinz forgot to nerf miasma research and cargo value after making it produce like 100x as much lmao
-
- kevinz000 updated:
-
- - Hierophant now goes sicko mode, but hey, at least you can't be multi-hit by melee waves!
- - Racking shotguns is now more threatening.
- - Medibots no longer kill slimes when trying to heal their toxins.
- - The Syndicate started selling claymores to their agents.
- - Nerfed VTEC modules.
- - Neurotoxin no longer stuns non-carbons.
- - peacekeeper cyborgs now get a megaphone
- - Fixes storage bugs regarding reaching into things you shouldn't be able to reach into.
- - BYOND 513 preliminary support added.
- - Trashbags now only allow accessing the first 3 items. 5 for bluespace ones. experimental: Storage now allows for limiting of random access
-
- kiwedespars updated:
-
- - regenerative materia to hallucination sting
- - mindbreaker toxin as an actual chemical to hallucination sting
-
- lolman360 updated:
-
- - NT has authorized shipments or Cotton to Megaseed Servitors. It's time to start picking, liggers.
- - missing durathread sprites
- - Added durathread jumpskirt
- - Duraskirt sprites and rolled down jumpsuit sprites.
- - Fixes an undocumented change to the naming of Plasmamen.
- - chainsaw kind of weapons and the mecha drill and the CLAMP can now be used with 100% accuracy for surgery
- - surgery tools now work on defines
- - advanced surgerytools can now switch types instead of just being faster
- - fixes bug with new surgerytools examine
-
- nicc updated:
-
- - Exo-suit
- - SEVA suit
- - Flags for Goliath resistance and weakness
- - suit voucher
- - temp suit sprites
- - *dab
- - teg less gay maybe
-
- ninjanomnom and WhoneedSpacee updated:
-
- - Some rpg affixes now have special effects
- - New RPGLoot modifiers: Vampirism which heals you when you attack, Pyromantic which sets things you hit on fire. Shrapnel which causes projectiles fired from a gun to fire projectiles in a radius when they hit something. Finally, Summoning which summons mobs that sometimes aid you in combat.
-
- original by @randolfthemeh and @twaticus, port by sishen1542 updated:
-
- - jumpskirts
- - more jumpskirts
- - jumpskirt/suit prefs
-
- original by Bumtickley00, port by sishen1542 updated:
-
- - Suit storage units will now also remove radiation from mobs.
-
- original by GuyonBroadway, SkowronX, and Arizon5. port by sishen1542 and kerse updated:
-
- - Clockwork cultists may now summon forth Neovgre, the ratvrarian super weapon. This powerful mech can be summoned when applications scripture has been unlocked, boasts superior offensive and defensive capabilities, however once a pilot enters he cannot leave and is doomed to die with the mech.
- - Sexy Sprite work courtesy or SkowronX from /tg/
- - brass edits by Arizon5
- - steamy laser by kerse
-
- original by Skoglol, port by sishen1542 updated:
-
- - Added lots of new virus cures, made cure difficulty scale more consistently. Cures are now picked from a list of possible cures per resistance level, multiple diseases at the same level no longer always share a cure. Looking at you table salt.
- - Dynamic gamemode now more auto-deadmin friendly.
-
- original by TheChosenEvilOne, port by sishen1542 updated:
-
- - Ported dynamic mode from /vg/, originally made by @DeityLink, @Kurfursten and @ShiftyRail
-
- original by Tlaltecuhtli, port by sishen1542 updated:
-
- - rcd disk that gives rcd computer frame and machine frame designs
- - upgraded rcd in CE lockers
- - moved deconstruction to the upgrade disk, ashwalker rcd comes upgraded
-
- original by actioninja, port by sishen1542 updated:
-
- - Medical and Security consoles now check access on worn or inhand ID instead of requiring an inserted ID
- - mining vendor now reads from ID in hand or on person instead of requiring an inserted ID
- - ORM is functional again (for real this time)
- - ORM claim points button transfers points to worn/inhand ID instead of to an inserted ID, no longer accepts insertions
- - Same for gulag consoles
-
- original by redmoogle, port by sishen1542 updated:
-
- - Added support for 3 new gasses; Tritium, Pluoxium, and BZ
-
- original by: WJohnston, Antur, Arcane, plapatin, sprites by cogwerks and edited by mrdoombringer. port by sishen1542 updated:
-
- r4d6 updated:
-
- - Added decoratives angel wings for Mammalians only
- - Added blindfolds to the Loadout list
- - Added Decorative Wings for Humans, Felinids, Slimepersons and Lizardpeoples.
- - Change the SEVA suit & Exo-suit's descriptions
- - Batteries are now Rad-Proof like the other stock parts
-
- tigercat2000@Paradise updated:
-
- - fixed invalid characters breaking chat output for that message
-
- tinfoil hat wearer updated:
-
- - Added a new alien technology disk to scientist and roboticist uplinks that allows them to research the heavily-guarded secrets of the Grays.
- - Alientech is now the only Hidden alien research. To compensate for this, alien_bio and alien_engi have had their research costs doubled and now require advanced surgery tools and experimental tools respectively to research. Their export price is also halved.
- - roboticists now have brainwashing disks AND alien technology added to their role-restricted uplink section. alien technology gives them brainwashing at a much later date, so brainwashing is the much cheaper option for instant power. makes logical sense because doctors get it as well because they do surgery, and roboticists can now either choose to brainwash people for less price but less power or emag borgs for higher prices, limited uses, but higher power.
-
- ursamedium updated:
-
|