Parry Stats
| Name/Description | Value |
|---|
"
+ RENDER_VARIABLE_SIMPLE(parry_respect_clickdelay, "Whether or not (1 or 0) you can only parry if your attack cooldown isn't in effect.")
+ RENDER_VARIABLE_SIMPLE(parry_stamina_cost, "Buffered stamina damage incurred by you for parrying with this.")
+ RENDER_ATTACK_TYPES(parry_attack_types, "Attack types you can parry.")
+ // parry_flags
+ dat += ""
+ RENDER_VARIABLE_SIMPLE(parry_time_windup, "Deciseconds of parry windup.")
+ RENDER_VARIABLE_SIMPLE(parry_time_spindown, "Deciseconds of parry spindown.")
+ RENDER_VARIABLE_SIMPLE(parry_time_active, "Deciseconds of active parry window - This is the ONLY time your parry is active.")
+ RENDER_VARIABLE_SIMPLE(parry_time_windup_visual_override, "Visual effect length override")
+ RENDER_VARIABLE_SIMPLE(parry_time_spindown_visual_override, "Visual effect length override")
+ RENDER_VARIABLE_SIMPLE(parry_time_active_visual_override, "Visual effect length override")
+ RENDER_VARIABLE_SIMPLE(parry_time_perfect, "Deciseconds into the active window considered the 'center' of the perfect period.")
+ RENDER_VARIABLE_SIMPLE(parry_time_perfect_leeway, "Leeway on both sides of the perfect period's center still considered perfect.")
+ RENDER_OVERRIDE_LIST(parry_time_perfect_leeway_override, "Override for the above for each attack type")
+ RENDER_VARIABLE_SIMPLE(parry_imperfect_falloff_percent, "Linear falloff in percent per decisecond for attacks parried outside of perfect window.")
+ RENDER_OVERRIDE_LIST(parry_imperfect_falloff_percent_override, "Override for the above for each attack type")
+ RENDER_VARIABLE_SIMPLE(parry_efficiency_perfect, "Efficiency in percentage a parry in the perfect window is considered.")
+ // parry_data
+ dat += ""
+ RENDER_VARIABLE_SIMPLE(parry_efficiency_considered_successful, "Minimum parry efficiency to be considered a successful parry.")
+ RENDER_VARIABLE_SIMPLE(parry_efficiency_to_counterattack, "Minimum parry efficiency to trigger counterattack effects.")
+ RENDER_VARIABLE_SIMPLE(parry_max_attacks, "Max attacks parried per parry cycle.")
+ RENDER_VARIABLE_SIMPLE(parry_effect_icon_state, "Parry effect image name")
+ RENDER_VARIABLE_SIMPLE(parry_cooldown, "Deciseconds it has to be since the last time a parry sequence ended for you before you can parry again.")
+ RENDER_VARIABLE_SIMPLE(parry_failed_stagger_duration, "Deciseconds you are staggered for at the of the parry sequence if you do not successfully parry anything.")
+ RENDER_VARIABLE_SIMPLE(parry_failed_clickcd_duration, "Deciseconds you are put on attack cooldown at the end of the parry sequence if you do not successfully parry anything.")
+ dat += "
"
+ return dat.Join("")
+#undef RENDER_VARIABLE_SIMPLE
+#undef RENDER_OVERRIDE_LIST
+#undef RENDER_ATTACK_TYPES
+#undef RENDER_BLOCK_DIRECTIONS
+
+// MOB PROCS
+
+/**
+ * Called every life tick to handle blocking/parrying effects.
+ */
+/mob/living/proc/handle_block_parry(seconds = 1)
+ if(combat_flags & COMBAT_FLAG_ACTIVE_BLOCKING)
+ var/datum/block_parry_data/data = return_block_parry_datum(active_block_item.block_parry_data)
+ adjustStaminaLossBuffered(data.block_stamina_cost_per_second * seconds)
+
+/mob/living/on_item_dropped(obj/item/I)
+ if(I == active_block_item)
+ stop_active_blocking()
+ if(I == active_parry_item)
+ end_parry_sequence()
+ return ..()
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index b3b49cb7cd..2ca1b63b14 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -1,12 +1,7 @@
-/mob/living/proc/run_armor_check(def_zone = null, attack_flag = "melee", absorb_text = null, soften_text = null, armour_penetration, penetrated_text, silent=FALSE)
+/mob/living/proc/run_armor_check(def_zone = null, attack_flag = "melee", absorb_text = "Your armor absorbs the blow!", soften_text = "Your armor softens the blow!", armour_penetration, penetrated_text = "Your armor was penetrated!")
var/armor = getarmor(def_zone, attack_flag)
- if(armor <= 0)
- return armor
- if(silent)
- return max(0, armor - armour_penetration)
-
//the if "armor" check is because this is used for everything on /living, including humans
if(armor && armour_penetration)
armor = max(0, armor - armour_penetration)
@@ -15,7 +10,7 @@
else if(armor >= 100)
if(absorb_text)
to_chat(src, "
[absorb_text]")
- else
+ else if(armor > 0)
if(soften_text)
to_chat(src, "
[soften_text]")
return armor
@@ -71,22 +66,30 @@
CRASH("Invalid rediretion mode [redirection_mode]")
/mob/living/bullet_act(obj/item/projectile/P, def_zone)
+ var/totaldamage = P.damage
+ var/final_percent = 0
if(P.original != src || P.firer != src) //try to block or reflect the bullet, can't do so when shooting oneself
var/list/returnlist = list()
var/returned = mob_run_block(P, P.damage, "the [P.name]", ATTACK_TYPE_PROJECTILE, P.armour_penetration, P.firer, def_zone, returnlist)
+ final_percent = returnlist[BLOCK_RETURN_PROJECTILE_BLOCK_PERCENTAGE]
if(returned & BLOCK_SHOULD_REDIRECT)
handle_projectile_attack_redirection(P, returnlist[BLOCK_RETURN_REDIRECT_METHOD])
if(returned & BLOCK_REDIRECTED)
return BULLET_ACT_FORCE_PIERCE
if(returned & BLOCK_SUCCESS)
- P.on_hit(src, 100, def_zone)
+ P.on_hit(src, final_percent, def_zone)
return BULLET_ACT_BLOCK
+ totaldamage = block_calculate_resultant_damage(totaldamage, returnlist)
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)
+ apply_damage(totaldamage, P.damage_type, def_zone, armor)
if(P.dismemberment)
check_projectile_dismemberment(P, def_zone)
- return P.on_hit(src, armor) ? BULLET_ACT_HIT : BULLET_ACT_BLOCK
+ var/missing = 100 - final_percent
+ var/armor_ratio = armor * 0.01
+ if(missing > 0)
+ final_percent += missing * armor_ratio
+ return P.on_hit(src, final_percent, def_zone) ? BULLET_ACT_HIT : BULLET_ACT_BLOCK
/mob/living/proc/check_projectile_dismemberment(obj/item/projectile/P, def_zone)
return 0
@@ -116,11 +119,14 @@
I = AM
throwpower = I.throwforce
var/impacting_zone = ran_zone(BODY_ZONE_CHEST, 65)//Hits a random part of the body, geared towards the chest
- if(mob_run_block(AM, throwpower, "\the [AM.name]", ATTACK_TYPE_THROWN, 0, throwingdatum?.thrower, impacting_zone, null) & BLOCK_SUCCESS)
+ var/list/block_return = list()
+ var/total_damage = I.throwforce
+ if(mob_run_block(AM, throwpower, "\the [AM.name]", ATTACK_TYPE_THROWN, 0, throwingdatum?.thrower, impacting_zone, block_return) & BLOCK_SUCCESS)
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()))
+ total_damage = block_calculate_resultant_damage(total_damage, block_return)
+ 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
@@ -129,12 +135,9 @@
return TRUE
var/dtype = BRUTE
var/volume = I.get_volume_by_throwforce_and_or_w_class()
- var/nosell_hit = SEND_SIGNAL(I, COMSIG_MOVABLE_IMPACT_ZONE, src, impacting_zone, throwingdatum) // TODO: find a better way to handle hitpush and skipcatch for humans
- if(nosell_hit)
- skipcatch = TRUE
- hitpush = FALSE
-
+ SEND_SIGNAL(I, COMSIG_MOVABLE_IMPACT_ZONE, src, impacting_zone)
dtype = I.damtype
+
if (I.throwforce > 0) //If the weapon's throwforce is greater than zero...
if (I.throwhitsound) //...and throwhitsound is defined...
playsound(loc, I.throwhitsound, volume, 1, -1) //...play the weapon's throwhitsound.
@@ -151,7 +154,7 @@
visible_message("
[src] has been hit by [I].", \
"
You have been hit by [I].")
var/armor = run_armor_check(impacting_zone, "melee", "Your armor has protected your [parse_zone(impacting_zone)].", "Your armor has softened hit to your [parse_zone(impacting_zone)].",I.armour_penetration)
- apply_damage(I.throwforce, dtype, impacting_zone, armor)
+ apply_damage(total_damage, dtype, impacting_zone, armor)
if(I.thrownby)
log_combat(I.thrownby, src, "threw and hit", I)
else
@@ -321,8 +324,10 @@
var/damage = rand(5, 35)
if(M.is_adult)
damage = rand(20, 40)
- if(mob_run_block(M, damage, "the [M.name]", ATTACK_TYPE_MELEE, null, M, check_zone(M.zone_selected), null) & BLOCK_SUCCESS)
+ var/list/block_return = list()
+ if(mob_run_block(M, damage, "the [M.name]", ATTACK_TYPE_MELEE, null, M, check_zone(M.zone_selected), block_return) & BLOCK_SUCCESS)
return FALSE
+ damage = block_calculate_resultant_damage(damage, block_return)
if (stat != DEAD)
log_combat(M, src, "attacked")
@@ -338,13 +343,16 @@
M.visible_message("
\The [M] [M.friendly_verb_continuous] [src]!",
"
You [M.friendly_verb_simple] [src]!", target = src,
target_message = "
\The [M] [M.friendly_verb_continuous] you!")
- return FALSE
+ return 0
else
if(HAS_TRAIT(M, TRAIT_PACIFISM))
to_chat(M, "
You don't want to hurt anyone!")
return FALSE
- if(mob_run_block(M, rand(M.melee_damage_lower, M.melee_damage_upper), "the [M.name]", ATTACK_TYPE_MELEE, M.armour_penetration, M, check_zone(M.zone_selected), null) & BLOCK_SUCCESS)
- return FALSE
+ var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+ var/list/return_list = list()
+ if(mob_run_block(M, damage, "the [M.name]", ATTACK_TYPE_MELEE, M.armour_penetration, M, check_zone(M.zone_selected), return_list) & BLOCK_SUCCESS)
+ return 0
+ damage = block_calculate_resultant_damage(damage, return_list)
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
M.do_attack_animation(src)
@@ -352,7 +360,7 @@
"
\The [M] [M.attack_verb_continuous] you!", null, COMBAT_MESSAGE_RANGE, null,
M, "
You [M.attack_verb_simple] [src]!")
log_combat(M, src, "attacked")
- return TRUE
+ return damage
/mob/living/attack_paw(mob/living/carbon/monkey/M)
if (M.a_intent == INTENT_HARM)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index da24f190e8..b037221e2c 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -29,6 +29,26 @@
var/mobility_flags = MOBILITY_FLAGS_DEFAULT
+ // Combat - Blocking/Parrying system
+ /// Our block_parry_data for unarmed blocks/parries. Currently only used for parrying, as unarmed block isn't implemented yet. YOU MUST RUN [get_block_parry_data(this)] INSTEAD OF DIRECTLY ACCESSING!
+ var/datum/block_parry_data/block_parry_data = /datum/block_parry_data // defaults to *something* because [combat_flags] dictates whether or not we can unarmed block/parry.
+ // Blocking
+ /// The item the user is actively blocking with if any.
+ var/obj/item/active_block_item
+ // Parrying
+ /// Whether or not the user is in the middle of an active parry. Set to [UNARMED_PARRY], [ITEM_PARRY], [MARTIAL_PARRY] if parrying.
+ var/parrying = FALSE
+ /// The itme the user is currently parrying with, if any.
+ var/obj/item/active_parry_item
+ /// world.time of parry action start
+ var/parry_start_time = 0
+ /// Current parry effect.
+ var/obj/effect/abstract/parry/parry_visual_effect
+ /// world.time of last parry end
+ var/parry_end_time_last = 0
+ /// Successful parries within the current parry cycle. It's a list of efficiency percentages.
+ var/list/successful_parries
+
var/confused = 0 //Makes the mob move in random directions.
var/hallucination = 0 //Directly affects how long a mob will hallucinate for
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index 4b90191dcc..71bcef9aca 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -3,10 +3,21 @@
update_turf_movespeed(loc)
//Hide typing indicator if we move.
clear_typing_indicator()
- if(is_shifted)
- is_shifted = FALSE
- pixel_x = get_standard_pixel_x_offset(lying)
- pixel_y = get_standard_pixel_y_offset(lying)
+ update_pixel_shifting(TRUE)
+
+/mob/living/setDir(newdir, ismousemovement)
+ . = ..()
+ if(ismousemovement)
+ update_pixel_shifting()
+
+/mob/living/proc/update_pixel_shifting(moved = FALSE)
+ if(combat_flags & COMBAT_FLAG_ACTIVE_BLOCKING)
+ animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 2.5, flags = ANIMATION_END_NOW)
+ else if(moved)
+ if(is_shifted)
+ is_shifted = FALSE
+ pixel_x = get_standard_pixel_x_offset(lying)
+ pixel_y = get_standard_pixel_y_offset(lying)
/mob/living/CanPass(atom/movable/mover, turf/target)
if((mover.pass_flags & PASSMOB))
diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm
index 2bcb3c9b5a..9cefa7a12f 100644
--- a/code/modules/mob/living/silicon/ai/ai_defense.dm
+++ b/code/modules/mob/living/silicon/ai/ai_defense.dm
@@ -1,4 +1,4 @@
-/mob/living/silicon/ai/attacked_by(obj/item/I, mob/living/user, def_zone)
+/mob/living/silicon/ai/attacked_by(obj/item/I, mob/living/user, def_zone, attackchain_flags = NONE, damage_multiplier = 1)
. = ..()
if(!.)
return FALSE
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 59dfcd3003..bf66556399 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -359,7 +359,8 @@
"Sleek" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "sleekmed"),
"Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinamed"),
"Eyebot" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "eyebotmed"),
- "Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavymed")
+ "Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavymed"),
+ "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_med")
)
var/list/L = list("Medihound" = "medihound", "Medihound Dark" = "medihounddark", "Vale" = "valemed")
for(var/a in L)
@@ -375,6 +376,8 @@
switch(med_borg_icon)
if("Default")
cyborg_base_icon = "medical"
+ if("Zoomba")
+ cyborg_base_icon = "zoomba_med"
if("Droid")
cyborg_base_icon = "medical"
cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
@@ -476,7 +479,8 @@
"Can" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "caneng"),
"Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinaeng"),
"Spider" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "spidereng"),
- "Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavyeng")
+ "Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavyeng"),
+ "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_engi")
)
var/list/L = list("Pup Dozer" = "pupdozer", "Vale" = "valeeng")
for(var/a in L)
@@ -492,6 +496,8 @@
switch(engi_borg_icon)
if("Default")
cyborg_base_icon = "engineer"
+ if("Zoomba")
+ cyborg_base_icon = "zoomba_engi"
if("Default - Treads")
cyborg_base_icon = "engi-tread"
special_light_key = "engineer"
@@ -572,7 +578,8 @@
"Can" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "cansec"),
"Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinasec"),
"Spider" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "spidersec"),
- "Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavysec")
+ "Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavysec"),
+ "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_sec")
)
var/list/L = list("K9" = "k9", "Vale" = "valesec", "K9 Dark" = "k9dark")
for(var/a in L)
@@ -588,6 +595,8 @@
switch(sec_borg_icon)
if("Default")
cyborg_base_icon = "sec"
+ if("Zoomba")
+ cyborg_base_icon = "zoomba_sec"
if("Default - Treads")
cyborg_base_icon = "sec-tread"
special_light_key = "sec"
@@ -827,6 +836,7 @@
"(Janitor) Sleek" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "sleekjan"),
"(Janitor) Can" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "canjan"),
"(Janitor) Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavyjan"),
+ "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_jani")
)
var/list/L = list("(Service) DarkK9" = "k50", "(Service) Vale" = "valeserv", "(Service) ValeDark" = "valeservdark",
"(Janitor) Scrubpuppy" = "scrubpup")
@@ -841,6 +851,8 @@
service_icons = sortList(service_icons)
var/service_robot_icon = show_radial_menu(R, R , service_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
switch(service_robot_icon)
+ if("Zoomba")
+ cyborg_base_icon = "zoomba_jani"
if("(Service) Waitress")
cyborg_base_icon = "service_f"
special_light_key = "service"
@@ -944,6 +956,7 @@
"Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinamin"),
"Can" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "canmin"),
"Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavymin"),
+ "Zoomba" = image(icon = 'icons/mob/robots.dmi', icon_state = "zoomba_miner")
)
var/list/L = list("Blade" = "blade", "Vale" = "valemine")
for(var/a in L)
@@ -987,6 +1000,8 @@
cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
sleeper_overlay = "valeminesleeper"
dogborg = TRUE
+ if("Zoomba")
+ cyborg_base_icon = "zoomba_miner"
else
return FALSE
return ..()
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 173db6f69b..7a9610fb53 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -396,6 +396,12 @@
return aicamera.selectpicture(user)
/mob/living/silicon/proc/ai_roster()
+ if(!client)
+ return
+ if(world.time < client.crew_manifest_delay)
+ return
+ client.crew_manifest_delay = world.time + (1 SECONDS)
+
var/dat = "
Crew RosterCrew Roster:"
dat += GLOB.data_core.get_manifest()
diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index cd50ffbae6..0850f0f886 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -33,7 +33,7 @@
/mob/living/silicon/attack_animal(mob/living/simple_animal/M)
. = ..()
if(.)
- var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+ var/damage = .
if(prob(damage))
for(var/mob/living/N in buckled_mobs)
N.DefaultCombatKnockdown(20)
@@ -120,6 +120,7 @@
flash_act(affect_silicon = 1)
/mob/living/silicon/bullet_act(obj/item/projectile/P, def_zone)
+ var/totaldamage = P.damage
if(P.original != src || P.firer != src) //try to block or reflect the bullet, can't do so when shooting oneself
var/list/returnlist = list()
var/returned = mob_run_block(P, P.damage, "the [P.name]", ATTACK_TYPE_PROJECTILE, P.armour_penetration, P.firer, def_zone, returnlist)
@@ -128,22 +129,18 @@
if(returned & BLOCK_REDIRECTED)
return BULLET_ACT_FORCE_PIERCE
if(returned & BLOCK_SUCCESS)
- P.on_hit(src, 100, def_zone)
+ P.on_hit(src, returnlist[BLOCK_RETURN_PROJECTILE_BLOCK_PERCENTAGE], def_zone)
return BULLET_ACT_BLOCK
+ totaldamage = block_calculate_resultant_damage(totaldamage, returnlist)
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]!",
- "
You are knocked off of [src]!")
- unbuckle_mob(M)
- M.DefaultCombatKnockdown(40)
- if(P.stun || P.knockdown)
+ adjustBruteLoss(totaldamage)
+ if((P.damage >= 10) || P.stun || P.knockdown || (P.stamina >= 20))
for(var/mob/living/M in buckled_mobs)
- unbuckle_mob(M)
M.visible_message("
[M] is knocked off of [src] by the [P]!",
"
You are knocked off of [src] by the [P]!")
- P.on_hit(src)
+ unbuckle_mob(M)
+ M.DefaultCombatKnockdown(40)
+ P.on_hit(src, 0, def_zone)
return BULLET_ACT_HIT
/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 1e56e91ae1..278bb37d0d 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -94,7 +94,7 @@
/mob/living/simple_animal/attack_animal(mob/living/simple_animal/M)
. = ..()
if(.)
- var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+ var/damage = .
return attack_threshold_check(damage, M.melee_damage_type)
/mob/living/simple_animal/attack_slime(mob/living/simple_animal/slime/M)
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 97f3dad3f0..39eccf9ad4 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -98,6 +98,10 @@
hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD, DIAG_PATH_HUD = HUD_LIST_LIST) //Diagnostic HUD views
+ var/commissioned = FALSE // Will other (noncommissioned) bots salute this bot?
+ var/can_salute = TRUE
+ var/salute_delay = 60 SECONDS
+
/mob/living/simple_animal/bot/proc/get_mode()
if(client) //Player bots do not have modes, thus the override. Also an easy way for PDA users/AI to know when a bot is a player.
if(paicard)
@@ -251,6 +255,14 @@
if(!on || client)
return
+ if(!commissioned && can_salute)
+ for(var/mob/living/simple_animal/bot/B in get_hearers_in_view(5, get_turf(src)))
+ if(B.commissioned)
+ visible_message("
[src] performs an elaborate salute for [B]!")
+ can_salute = FALSE
+ addtimer(VARSET_CALLBACK(src, can_salute, TRUE), salute_delay)
+ break
+
switch(mode) //High-priority overrides are processed first. Bots can do nothing else while under direct command.
if(BOT_RESPONDING) //Called by the AI.
call_mode()
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 73099d8d9f..f6aad5c03f 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -14,7 +14,7 @@
model = "Cleanbot"
bot_core_type = /obj/machinery/bot_core/cleanbot
window_id = "autoclean"
- window_name = "Automatic Station Cleaner v1.2"
+ window_name = "Automatic Station Cleaner v1.3"
pass_flags = PASSMOB
path_image_color = "#993299"
weather_immunities = list("lava","ash")
@@ -36,8 +36,62 @@
var/next_dest
var/next_dest_loc
+ var/obj/item/weapon
+ var/weapon_orig_force = 0
+ var/chosen_name
+
+ var/list/stolen_valor
+
+ var/static/list/officers = list("Captain", "Head of Personnel", "Head of Security")
+ var/static/list/command = list("Captain" = "Cpt.","Head of Personnel" = "Lt.")
+ var/static/list/security = list("Head of Security" = "Maj.", "Warden" = "Sgt.", "Detective" = "Det.", "Security Officer" = "Officer")
+ var/static/list/engineering = list("Chief Engineer" = "Chief Engineer", "Station Engineer" = "Engineer", "Atmospherics Technician" = "Technician")
+ var/static/list/medical = list("Chief Medical Officer" = "C.M.O.", "Medical Doctor" = "M.D.", "Chemist" = "Pharm.D.")
+ var/static/list/research = list("Research Director" = "Ph.D.", "Roboticist" = "M.S.", "Scientist" = "B.S.")
+ var/static/list/legal = list("Lawyer" = "Esq.")
+
+ var/list/prefixes
+ var/list/suffixes
+
+/mob/living/simple_animal/bot/cleanbot/proc/deputize(obj/item/W, mob/user)
+ if(in_range(src, user))
+ to_chat(user, "
You attach \the [W] to \the [src].")
+ user.transferItemToLoc(W, src)
+ weapon = W
+ weapon_orig_force = weapon.force
+ if(!emagged)
+ weapon.force = weapon.force / 2
+ add_overlay(image(icon=weapon.lefthand_file,icon_state=weapon.item_state))
+
+/mob/living/simple_animal/bot/cleanbot/proc/update_titles()
+ var/working_title = ""
+
+ for(var/pref in prefixes)
+ for(var/title in pref)
+ if(title in stolen_valor)
+ working_title += pref[title] + " "
+ if(title in officers)
+ commissioned = TRUE
+ break
+
+ working_title += chosen_name
+
+ for(var/suf in suffixes)
+ for(var/title in suf)
+ if(title in stolen_valor)
+ working_title += " " + suf[title]
+ break
+
+ name = working_title
+
+/mob/living/simple_animal/bot/cleanbot/examine(mob/user)
+ . = ..()
+ if(weapon)
+ . += "
Is that \a [weapon] taped to it...?"
+
/mob/living/simple_animal/bot/cleanbot/Initialize()
. = ..()
+ chosen_name = name
get_targets()
icon_state = "cleanbot[on]"
@@ -45,6 +99,18 @@
access_card.access += J.get_access()
prev_access = access_card.access
+ stolen_valor = list()
+
+ prefixes = list(command, security, engineering)
+ suffixes = list(research, medical, legal)
+
+/mob/living/simple_animal/bot/cleanbot/Destroy()
+ if(weapon)
+ var/atom/Tsec = drop_location()
+ weapon.force = weapon_orig_force
+ drop_part(weapon, Tsec)
+ return ..()
+
/mob/living/simple_animal/bot/cleanbot/turn_on()
..()
icon_state = "cleanbot[on]"
@@ -57,6 +123,8 @@
/mob/living/simple_animal/bot/cleanbot/bot_reset()
..()
+ if(weapon && (emagged == 2))
+ weapon.force = weapon_orig_force
ignore_list = list() //Allows the bot to clean targets it previously ignored due to being unreachable.
target = null
oldloc = null
@@ -66,6 +134,22 @@
text_dehack = "[name]'s software has been reset!"
text_dehack_fail = "[name] does not seem to respond to your repair code!"
+/mob/living/simple_animal/bot/cleanbot/Crossed(atom/movable/AM)
+ . = ..()
+
+ zone_selected = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
+ if(weapon && has_gravity() && ismob(AM))
+ var/mob/living/carbon/C = AM
+ if(!istype(C))
+ return
+
+ if(!(C.job in stolen_valor))
+ stolen_valor += C.job
+ update_titles()
+
+ weapon.attack(C, src)
+ C.Knockdown(20)
+
/mob/living/simple_animal/bot/cleanbot/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda))
if(bot_core.allowed(user) && !open && !emagged)
@@ -79,6 +163,11 @@
else
to_chat(user, "
The [src] doesn't seem to respect your authority.")
+ else if(istype(W, /obj/item/kitchen/knife) && user.a_intent != INTENT_HARM)
+ to_chat(user, "
You start attaching \the [W] to \the [src]...")
+ if(do_after(user, 25, target = src))
+ deputize(W, user)
+
else if(istype(W, /obj/item/mop/advanced))
if(bot_core.allowed(user) && open && !CHECK_BITFIELD(upgrades,UPGRADE_CLEANER_ADVANCED_MOP))
to_chat(user, "
You replace \the [src] old mop with a new better one!")
@@ -87,10 +176,10 @@
window_name = "Automatic Station Cleaner v2.1 BETA" //New!
qdel(W)
if(!open)
- to_chat(user, "
The [src] access pannle is not open!")
+ to_chat(user, "
The [src] access panel is not open!")
return
if(!bot_core.allowed(user))
- to_chat(user, "
The [src] access pannel locked off to you!")
+ to_chat(user, "
The [src] access panel locked off to you!")
return
else
to_chat(user, "
The [src] already has this mop!")
@@ -116,6 +205,8 @@
/mob/living/simple_animal/bot/cleanbot/emag_act(mob/user)
. = ..()
if(emagged == 2)
+ if(weapon)
+ weapon.force = weapon_orig_force
if(user)
to_chat(user, "
[src] buzzes and beeps.")
diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
index 9a34f2c176..384fa8146f 100644
--- a/code/modules/mob/living/simple_animal/friendly/cockroach.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
@@ -23,6 +23,7 @@
speak_emote = list("chitters")
density = FALSE
ventcrawler = VENTCRAWLER_ALWAYS
+ mob_size = MOB_SIZE_TINY
gold_core_spawnable = FRIENDLY_SPAWN
verb_say = "chitters"
verb_ask = "chitters inquisitively"
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index d86362c974..e00e0648b5 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -22,6 +22,7 @@
friendly_verb_continuous = "pinches"
friendly_verb_simple = "pinch"
ventcrawler = VENTCRAWLER_ALWAYS
+ mob_size = MOB_SIZE_TINY
var/obj/item/inventory_head
var/obj/item/inventory_mask
gold_core_spawnable = FRIENDLY_SPAWN
diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm
index df416047e2..bb93f95ee4 100644
--- a/code/modules/mob/living/simple_animal/friendly/sloth.dm
+++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm
@@ -17,6 +17,7 @@
response_disarm_simple = "gently push aside"
response_harm_continuous = "kicks"
response_harm_simple = "kick"
+ mob_size = MOB_SIZE_SMALL
mob_biotypes = MOB_ORGANIC|MOB_BEAST
gold_core_spawnable = FRIENDLY_SPAWN
melee_damage_lower = 18
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index e41fa7c896..e8991df358 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -117,7 +117,7 @@
Move(get_step(src,chosen_dir))
face_atom(target) //Looks better if they keep looking at you when dodging
-/mob/living/simple_animal/hostile/attacked_by(obj/item/I, mob/living/user)
+/mob/living/simple_animal/hostile/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
if(stat == CONSCIOUS && !target && AIStatus != AI_OFF && !client && user)
FindTarget(list(user), 1)
return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
index 9d395ca5ff..c4f78b6e26 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
@@ -103,7 +103,7 @@ IGNORE_PROC_IF_NOT_TARGET(attack_slime)
return BULLET_ACT_FORCE_PIERCE
return ..()
-/mob/living/simple_animal/hostile/asteroid/curseblob/attacked_by(obj/item/I, mob/living/L)
+/mob/living/simple_animal/hostile/asteroid/curseblob/attacked_by(obj/item/I, mob/living/L, attackchain_flags = NONE, damage_multiplier = 1)
if(L != set_target)
L.changeNext_move(I.click_delay) //pre_attacked_by not called
return
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index 0ef5cabc91..f7876b3516 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -3,6 +3,7 @@
icon = 'icons/mob/slimes.dmi'
icon_state = "grey baby slime"
pass_flags = PASSTABLE
+ mob_size = MOB_SIZE_SMALL
ventcrawler = VENTCRAWLER_ALWAYS
gender = NEUTER
var/is_adult = 0
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index e14ff2f721..4c692e7175 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -1086,3 +1086,10 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
for(var/obj/item/I in held_items)
if(I.item_flags & SLOWS_WHILE_IN_HAND)
. += I.slowdown
+
+/**
+ * Mostly called by doUnEquip()
+ * Like item dropped() on mob side.
+ */
+/mob/proc/on_item_dropped(obj/item/I)
+ return
diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm
index d20fc4c6c0..a2176ca95e 100644
--- a/code/modules/movespeed/modifiers/mobs.dm
+++ b/code/modules/movespeed/modifiers/mobs.dm
@@ -119,3 +119,7 @@
/datum/movespeed_modifier/liver_cirrhosis
blacklisted_movetypes = FLOATING
variable = TRUE
+
+/datum/movespeed_modifier/active_block
+ variable = TRUE
+ flags = IGNORE_NOSLOW
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 3c3f3c9541..c18eebbb55 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -506,7 +506,7 @@
cell = null
qdel(src)
-/obj/machinery/light/attacked_by(obj/item/I, mob/living/user)
+/obj/machinery/light/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
..()
if(status == LIGHT_BROKEN || status == LIGHT_EMPTY)
if(on && (I.flags_1 & CONDUCT_1))
diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm
index 461166ab0d..2077b108d7 100644
--- a/code/modules/projectiles/ammunition/ballistic/pistol.dm
+++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm
@@ -44,7 +44,6 @@
desc = "A 9mm incendiary bullet casing."
projectile_type = /obj/item/projectile/bullet/incendiary/c9mm
-
// .50AE (Desert Eagle)
/obj/item/ammo_casing/a50AE
@@ -53,3 +52,16 @@
caliber = ".50"
projectile_type = /obj/item/projectile/bullet/a50AE
+// .32 ACP (Improvised Pistol)
+
+/obj/item/ammo_casing/c32acp
+ name = ".32 bullet casing"
+ desc = "A .32 bullet casing."
+ caliber = "c32acp"
+ projectile_type = /obj/item/projectile/bullet/c32acp
+
+/obj/item/ammo_casing/r32acp
+ name = ".32 rubber bullet casing"
+ desc = "A .32 rubber bullet casing."
+ caliber = "c32acp"
+ projectile_type = /obj/item/projectile/bullet/r32acp
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
index 174645dd11..492b91ec2d 100644
--- a/code/modules/projectiles/ammunition/energy/laser.dm
+++ b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -12,6 +12,15 @@
e_cost = 200
select_name = "kill"
+/obj/item/ammo_casing/energy/lasergun/improvised
+ projectile_type = /obj/item/projectile/beam/weak/improvised
+ e_cost = 200
+ select_name = "kill"
+
+/obj/item/ammo_casing/energy/lasergun/improvised/upgraded
+ projectile_type = /obj/item/projectile/beam/weak
+ e_cost = 100
+
/obj/item/ammo_casing/energy/laser/hos
e_cost = 100
diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm
index 63b0483875..1852b839f4 100644
--- a/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -66,3 +66,15 @@
caliber = ".50"
max_ammo = 7
multiple_sprites = 1
+
+/obj/item/ammo_box/magazine/m32acp
+ name = "pistol magazine (.32)"
+ desc = "A crudely construction pistol magazine that holds .32 ACP rounds. It looks like it can only fit eight bullets."
+ icon_state = "32acp"
+ ammo_type = /obj/item/ammo_casing/c32acp
+ caliber = "c32acp"
+ max_ammo = 8
+ multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/m32acp/empty
+ start_empty = 1
diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
index 7029cd4071..c2dd5bb42d 100644
--- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm
+++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
@@ -53,6 +53,7 @@
..()
/obj/item/minigunpack/dropped(mob/user)
+ . = ..()
if(armed)
user.dropItemToGround(gun, TRUE)
@@ -125,6 +126,7 @@
return
/obj/item/gun/ballistic/minigun/dropped(mob/user)
+ . = ..()
if(ammo_pack)
ammo_pack.attach_gun(user)
else
@@ -144,4 +146,5 @@
. = ..()
/obj/item/gun/ballistic/minigun/dropped(mob/living/user)
+ . = ..()
ammo_pack.attach_gun(user)
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index e15c49b891..319ec16345 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -115,6 +115,7 @@
icon_state = "flatgun"
/obj/item/gun/ballistic/automatic/pistol/stickman/pickup(mob/living/user)
+ . = ..()
to_chat(user, "
As you try to pick up [src], it slips out of your grip..")
if(prob(50))
to_chat(user, "
..and vanishes from your vision! Where the hell did it go?")
@@ -155,3 +156,19 @@
name = "Syndicate Anti Tank Pistol"
desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate a variety of joints without proper bracing."
pin = /obj/item/firing_pin/implant/pindicate
+
+////////////Improvised Pistol////////////
+
+/obj/item/gun/ballistic/automatic/pistol/improvised
+ name = "Improvised Pistol"
+ desc = "An improvised pocket-sized pistol that fires .32 calibre rounds. It looks incredibly flimsy."
+ icon_state = "ipistol"
+ item_state = "pistol"
+ mag_type = /obj/item/ammo_box/magazine/m32acp
+ fire_delay = 7.5
+ can_suppress = FALSE
+ w_class = WEIGHT_CLASS_SMALL
+ spread = 15 // Keep the spread between 15 and 20. This hardlocks it into being a mid-range pistol, the magazine size means you're allowed to miss. Fills the mid-range niche that slugs/rifle and buckshot doesn't fill.
+
+/obj/item/gun/ballistic/automatic/pistol/improvised/nomag
+ spawnwithmagazine = FALSE // For crafting as you shouldn't get eight bullets for free otherwise people will reaper reload.
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index b8b5ad6ec3..f34dbc6abc 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -319,7 +319,6 @@
/obj/item/gun/ballistic/revolver/doublebarrel/improvised
name = "improvised shotgun"
- desc = "Essentially a tube that aims shotgun shells."
desc = "A shoddy break-action breechloaded shotgun. Its lacklustre construction will probably result in it hurting people less than a normal shotgun."
icon_state = "ishotgun"
item_state = "shotgun"
@@ -330,8 +329,9 @@
mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
sawn_desc = "I'm just here for the gasoline."
unique_reskin = null
- projectile_damage_multiplier = 0.8
+ projectile_damage_multiplier = 0.9
var/slung = FALSE
+ weapon_weight = WEAPON_HEAVY
/obj/item/gun/ballistic/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
..()
@@ -358,7 +358,7 @@
/obj/item/gun/ballistic/revolver/doublebarrel/improvised/sawn
name = "sawn-off improvised shotgun"
- desc = "A single-shot shotgun. Better not miss."
+ desc = "The barrel and stock have been sawn and filed down; it can fit in backpacks. You still need two hands to fire this, if you value unbroken wrists."
icon_state = "ishotgun"
item_state = "gun"
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index a182ce2e35..8b8c5dceb1 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -131,6 +131,7 @@
desc = "A bolt-action breechloaded rifle that takes 7.62mm bullets."
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/improvised
can_bayonet = FALSE
+ var/slung = FALSE
/obj/item/gun/ballistic/shotgun/boltaction/pump(mob/M)
playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
@@ -152,6 +153,22 @@
. = ..()
. += "The bolt is [bolt_open ? "open" : "closed"]."
+/obj/item/gun/ballistic/shotgun/boltaction/improvised/attackby(obj/item/A, mob/user, params)
+ ..()
+ if(istype(A, /obj/item/stack/cable_coil) && !sawn_off)
+ if(A.use_tool(src, user, 0, 10, max_level = JOB_SKILL_BASIC))
+ slot_flags = ITEM_SLOT_BACK
+ to_chat(user, "
You tie the lengths of cable to the rifle, making a sling.")
+ slung = TRUE
+ update_icon()
+ else
+ to_chat(user, "
You need at least ten lengths of cable if you want to make a sling!")
+
+/obj/item/gun/ballistic/shotgun/boltaction/improvised/update_icon()
+ ..()
+ if(slung)
+ icon_state += "sling"
+
/obj/item/gun/ballistic/shotgun/boltaction/enchanted
name = "enchanted bolt action rifle"
desc = "Careful not to lose your head."
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 72ac9620b5..e64da116f3 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -240,3 +240,20 @@
chambered.BB.damage *= 5
process_fire(target, user, TRUE, params)
+
+////////////////
+// IMPROVISED //
+////////////////
+
+/obj/item/gun/energy/e_gun/old/improvised
+ name = "improvised energy rifle"
+ desc = "A crude imitation of an energy gun. It works, however the beams are poorly focused and most of the energy is wasted before it reaches the target. Welp, it still burns things."
+ icon_state = "improvised"
+ ammo_x_offset = 1
+ shaded_charge = 1
+ ammo_type = list(/obj/item/ammo_casing/energy/lasergun/improvised)
+
+/obj/item/gun/energy/e_gun/old/improvised/upgraded
+ name = "makeshift energy rifle"
+ desc = "The new lens and upgraded parts gives this a higher capacity and more energy output, however, the shoddy construction still leaves it inferior to Nanotrasen's own energy weapons."
+ ammo_type = list(/obj/item/ammo_casing/energy/lasergun/improvised/upgraded)
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index b46e6f5ead..d2643eeeb7 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -45,6 +45,8 @@
var/pixels_range_leftover = 0
/// "leftover" tick pixels and stuff yeah, so we don't round off things and introducing tracing inaccuracy.
var/pixels_tick_leftover = 0
+ /// Used to detect jumps in the middle of a pixel_move. Yes, this is ugly as sin code-wise but it works.
+ var/pixel_move_interrupted = FALSE
/// Pixels moved per second.
var/pixels_per_second = TILES_TO_PIXELS(12.5)
@@ -56,25 +58,9 @@
var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle
var/spread = 0 //amount (in degrees) of projectile spread
animate_movement = 0 //Use SLIDE_STEPS in conjunction with legacy
- /// how many times we've ricochet'd so far (instance variable, not a stat)
var/ricochets = 0
- /// how many times we can ricochet max
- var/ricochets_max = 0
- /// 0-100, the base chance of ricocheting, before being modified by the atom we shoot and our chance decay
- var/ricochet_chance = 0
- /// 0-1 (or more, I guess) multiplier, the ricochet_chance is modified by multiplying this after each ricochet
- var/ricochet_decay_chance = 0.7
- /// 0-1 (or more, I guess) multiplier, the projectile's damage is modified by multiplying this after each ricochet
- var/ricochet_decay_damage = 0.7
- /// On ricochet, if nonzero, we consider all mobs within this range of our projectile at the time of ricochet to home in on like Revolver Ocelot, as governed by ricochet_auto_aim_angle
- var/ricochet_auto_aim_range = 0
- /// On ricochet, if ricochet_auto_aim_range is nonzero, we'll consider any mobs within this range of the normal angle of incidence to home in on, higher = more auto aim
- var/ricochet_auto_aim_angle = 30
- /// the angle of impact must be within this many degrees of the struck surface, set to 0 to allow any angle
- var/ricochet_incidence_leeway = 40
-
- ///If the object being hit can pass ths damage on to something else, it should not do it for this bullet
- var/force_hit = FALSE
+ var/ricochets_max = 2
+ var/ricochet_chance = 30
//Hitscan
var/hitscan = FALSE //Whether this is hitscan. If it is, speed is basically ignored.
@@ -147,11 +133,6 @@
var/temporary_unstoppable_movement = FALSE
- ///If defined, on hit we create an item of this type then call hitby() on the hit target with this
- var/shrapnel_type
- ///If TRUE, hit mobs even if they're on the floor and not our target
- var/hit_stunned_targets = FALSE
-
/obj/item/projectile/Initialize()
. = ..()
permutated = list()
@@ -167,7 +148,6 @@
on_range()
/obj/item/projectile/proc/on_range() //if we want there to be effects when they reach the end of their range
- SEND_SIGNAL(src, COMSIG_PROJECTILE_RANGE_OUT)
qdel(src)
//to get the correct limb (if any) for the projectile hit message
@@ -184,17 +164,17 @@
/obj/item/projectile/proc/prehit(atom/target)
return TRUE
-/obj/item/projectile/proc/on_hit(atom/target, blocked = FALSE)
+/**
+ * Called when we hit something.
+ *
+ * @params
+ * * target - what we hit
+ * * blocked - 0 to 100 percentage mitigation/block
+ * * def zone - where we hit if we hit a mob.
+ */
+/obj/item/projectile/proc/on_hit(atom/target, blocked = 0, def_zone)
if(fired_from)
SEND_SIGNAL(fired_from, COMSIG_PROJECTILE_ON_HIT, firer, target, Angle)
-
- // i know that this is probably more with wands and gun mods in mind, but it's a bit silly that the projectile on_hit signal doesn't ping the projectile itself.
- // maybe we care what the projectile thinks! See about combining these via args some time when it's not 5AM
- var/obj/item/bodypart/hit_limb
- if(isliving(target))
- var/mob/living/L = target
- hit_limb = L.check_limb_hit(def_zone)
- SEND_SIGNAL(src, COMSIG_PROJECTILE_SELF_ON_HIT, firer, target, Angle, hit_limb)
var/turf/target_loca = get_turf(target)
var/hitx
@@ -246,13 +226,10 @@
new impact_effect_type(target_loca, hitx, hity)
var/organ_hit_text = ""
- var/limb_hit = hit_limb
+ var/limb_hit = L.check_limb_hit(def_zone)//to get the correct message info.
if(limb_hit)
organ_hit_text = " in \the [parse_zone(limb_hit)]"
-
- if(suppressed==SUPPRESSED_VERY)
- playsound(loc, hitsound, 5, TRUE, -1)
- else if(suppressed)
+ if(suppressed)
playsound(loc, hitsound, 5, 1, -1)
to_chat(L, "
You're shot by \a [src][organ_hit_text]!")
else
@@ -282,45 +259,54 @@
else
return 50 //if the projectile doesn't do damage, play its hitsound at 50% volume
-/obj/item/projectile/proc/on_ricochet(atom/A)
- if(!ricochet_auto_aim_angle || !ricochet_auto_aim_range)
- return
-
- var/mob/living/unlucky_sob
- var/best_angle = ricochet_auto_aim_angle
- if(firer && HAS_TRAIT(firer, TRAIT_NICE_SHOT))
- best_angle += NICE_SHOT_RICOCHET_BONUS
- for(var/mob/living/L in range(ricochet_auto_aim_range, src.loc))
- if(L.stat == DEAD || !isInSight(src, L))
- continue
- var/our_angle = abs(closer_angle_difference(Angle, get_projectile_angle(src.loc, L.loc)))
- if(our_angle < best_angle)
- best_angle = our_angle
- unlucky_sob = L
-
- if(unlucky_sob)
- setAngle(get_projectile_angle(src, unlucky_sob.loc))
-
/obj/item/projectile/proc/store_hitscan_collision(datum/point/pcache)
beam_segments[beam_index] = pcache
beam_index = pcache
beam_segments[beam_index] = null
-/obj/item/projectile/Bump(atom/A)
- var/datum/point/pcache = trajectory.copy_to()
- var/turf/T = get_turf(A)
- if(trajectory && ricochets < ricochets_max && check_ricochet_flag(A) && check_ricochet(A))
- ricochets++
- if(A.handle_ricochet(src))
- on_ricochet(A)
- ignore_source_check = TRUE
- decayedRange = max(0, decayedRange - reflect_range_decrease)
- ricochet_chance *= ricochet_decay_chance
- damage *= ricochet_decay_damage
- range = decayedRange
- if(hitscan)
- store_hitscan_collision(pcache)
+/**
+ * Determines if we should ricochet off of something.
+ * By default, asks the thing if we should ricochet off it, but because we're called first, we get final say.
+ * Returns TRUE or FALSE.
+ */
+/obj/item/projectile/proc/check_ricochet(atom/A)
+ if(ricochets > ricochets_max) //safety thing, we don't care about what the other thing says about this.
+ return FALSE
+ var/them = A.check_projectile_ricochet(src)
+ switch(them)
+ if(PROJECTILE_RICOCHET_PREVENT)
+ return FALSE
+ if(PROJECTILE_RICOCHET_FORCE)
return TRUE
+ if(PROJECTILE_RICOCHET_NO)
+ return FALSE
+ if(PROJECTILE_RICOCHET_YES)
+ return prob(ricochet_chance)
+ else
+ CRASH("Invalid return value for projectile ricochet check from [A].")
+
+/**
+ * Handles ricocheting off of something.
+ * By default, also asks the thing to handle it, but because we're called first, we get final say.
+ */
+/obj/item/projectile/proc/handle_ricochet(atom/A)
+ ricochets++
+ ignore_source_check = TRUE
+ decayedRange = max(0, decayedRange - reflect_range_decrease)
+ pixel_move_interrupted = TRUE
+ range = decayedRange
+ return A.handle_projectile_ricochet(src)
+
+/obj/item/projectile/Bump(atom/A)
+ if(!trajectory)
+ return
+ var/turf/T = get_turf(A)
+ if(check_ricochet(A))
+ var/datum/point/pcache = trajectory.copy_to()
+ if(hitscan)
+ store_hitscan_collision(pcache)
+ handle_ricochet(A)
+ return TRUE
var/distance = get_dist(T, starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations.
if(def_zone && check_zone(def_zone) != BODY_ZONE_CHEST)
@@ -395,21 +381,6 @@
return T
//Returns null if nothing at all was found.
-/obj/item/projectile/proc/check_ricochet(atom/A)
- var/chance = ricochet_chance * A.ricochet_chance_mod
- if(firer && HAS_TRAIT(firer, TRAIT_NICE_SHOT))
- chance += NICE_SHOT_RICOCHET_BONUS
- if(prob(chance))
- return TRUE
- return FALSE
-
-/obj/item/projectile/proc/check_ricochet_flag(atom/A)
- if((flag in list("energy", "laser")) && (A.flags_ricochet & RICOCHET_SHINY))
- return TRUE
- if((flag in list("bomb", "bullet")) && (A.flags_ricochet & RICOCHET_HARD))
- return TRUE
- return FALSE
-
/// one move is a tile.
/obj/item/projectile/proc/return_predicted_turf_after_moves(moves, forced_angle) //I say predicted because there's no telling that the projectile won't change direction/location in flight.
if(!trajectory && isnull(forced_angle) && isnull(Angle))
@@ -447,8 +418,6 @@
/obj/item/projectile/proc/fire(angle, atom/direct_target)
if(fired_from)
SEND_SIGNAL(fired_from, COMSIG_PROJECTILE_BEFORE_FIRE, src, original) //If no angle needs to resolve it from xo/yo!
- if(shrapnel_type)
- AddElement(/datum/element/embed, projectile_payload = shrapnel_type)
if(!log_override && firer && original)
log_combat(firer, original, "fired at", src, "from [get_area_name(src, TRUE)]")
if(direct_target)
@@ -489,6 +458,7 @@
/obj/item/projectile/proc/setAngle(new_angle, hitscan_store_segment = TRUE) //wrapper for overrides.
Angle = new_angle
+ pixel_move_interrupted = TRUE
if(!nondirectional_sprite)
var/matrix/M = new
M.Turn(Angle)
@@ -515,6 +485,7 @@
trajectory.initialize_location(target.x, target.y, target.z, 0, 0)
if(hitscan)
record_hitscan_start(RETURN_PRECISE_POINT(src))
+ pixel_move_interrupted = TRUE
if(zc)
after_z_change(old, target)
@@ -563,7 +534,7 @@
* The proc to make the projectile go, using a simulated pixel movement line trace.
* Note: deciseconds_equivalent is currently only used for homing, times is the number of times to move pixel_increment_amount.
* Trajectory multiplier directly modifies the factor of pixel_increment_amount to go per time.
- * It's complicated, so probably just don'ot mess with this unless you know what you're doing.
+ * It's complicated, so probably just don't mess with this unless you know what you're doing.
*/
/obj/item/projectile/proc/pixel_move(times, hitscanning = FALSE, deciseconds_equivalent = world.tick_lag, trajectory_multiplier = 1, allow_animation = TRUE)
if(!loc || !trajectory)
@@ -573,6 +544,7 @@
M.Turn(Angle)
transform = M
var/forcemoved = FALSE
+ pixel_move_interrupted = FALSE // reset that
var/turf/oldloc = loc
var/old_px = pixel_x
var/old_py = pixel_y
@@ -608,7 +580,9 @@
if(!--safety)
CRASH("[type] took too long (allowed: [CEILING(pixel_increment_amount/world.icon_size,1)*2] moves) to get to its location.")
step_towards(src, T)
- if(QDELETED(src))
+ if(QDELETED(src) || pixel_move_interrupted) // this doesn't take into account with pixel_move_interrupted the portion of the move cut off by any forcemoves, but we're opting to ignore that for now
+ // the reason is the entire point of moving to pixel speed rather than tile speed is smoothness, which will be crucial when pixel movement is done in the future
+ // reverting back to tile is more or less the only way of fixing this issue.
return
pixels_range_leftover += pixel_increment_amount
if(pixels_range_leftover > world.icon_size)
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 2f12f0f69b..d95c3b5028 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -39,6 +39,9 @@
/obj/item/projectile/beam/weak
damage = 15
+/obj/item/projectile/beam/weak/improvised
+ damage = 10
+
/obj/item/projectile/beam/weak/penetrator
armour_penetration = 50
diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm
index 319640a4d5..62ff4adb11 100644
--- a/code/modules/projectiles/projectile/bullets/pistol.dm
+++ b/code/modules/projectiles/projectile/bullets/pistol.dm
@@ -47,4 +47,16 @@
if(L.getStaminaLoss() >= 60)
L.Sleeping(300)
else
- L.adjustStaminaLoss(25)
\ No newline at end of file
+ L.adjustStaminaLoss(25)
+
+// .32 ACP (Improvised Pistol)
+
+/obj/item/projectile/bullet/c32acp
+ name = ".32 bullet"
+ damage = 13
+
+/obj/item/projectile/bullet/r32acp
+ name = ".32 rubber bullet"
+ damage = 3
+ eyeblur = 1
+ stamina = 20
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 0e0056f958..52fd89e37c 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -857,3 +857,13 @@
taste_mult = 2.5 //sugar's 1.5, capsacin's 1.5, so a good middle ground.
taste_description = "smokey sweetness"
value = REAGENT_VALUE_COMMON
+
+/datum/reagent/consumable/laughsyrup
+ name = "Laughin' Syrup"
+ description = "The product of juicing Laughin' Peas. Fizzy, and seems to change flavour based on what it's used with!"
+ nutriment_factor = 5 * REAGENTS_METABOLISM
+ color = "#803280"
+ taste_mult = 2
+ taste_description = "fizzy sweetness"
+ value = REAGENT_VALUE_COMMON
+
\ No newline at end of file
diff --git a/code/modules/research/bepis.dm b/code/modules/research/bepis.dm
index c6ce45f160..20ca7987d5 100644
--- a/code/modules/research/bepis.dm
+++ b/code/modules/research/bepis.dm
@@ -33,8 +33,8 @@
var/inaccuracy_percentage = 1.5
var/positive_cash_offset = 0
var/negative_cash_offset = 0
- var/minor_rewards = list(/obj/item/stack/circuit_stack/full, //To add a new minor reward, add it here.
- /obj/item/airlock_painter/decal,
+ var/minor_rewards = list(/obj/item/stack/circuit_stack/full, //To add a new minor reward, add it here.
+ /obj/item/flashlight/flashdark,
/obj/item/pen/survival,
/obj/item/circuitboard/machine/sleeper/party,
/obj/item/toy/sprayoncan)
diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm
index 9cbef4abdd..9768d80a59 100644
--- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm
+++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm
@@ -30,6 +30,14 @@
build_path = /obj/item/ammo_box/c38
category = list("initial", "Security")
+/datum/design/r32acp
+ name = "Rubber Pistol Bullet (.32)"
+ id = "r32acp"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 250)
+ build_path = /obj/item/ammo_casing/r32acp
+ category = list("initial", "Security")
+
/////////////////
///Hacked Gear //
/////////////////
@@ -78,7 +86,7 @@
name = "Rifle Receiver"
id = "rifle_receiver"
build_type = AUTOLATHE
- materials = list(/datum/material/iron = 40000)
+ materials = list(/datum/material/iron = 24000)
build_path = /obj/item/weaponcrafting/improvised_parts/rifle_receiver
category = list("hacked", "Security")
@@ -197,3 +205,23 @@
materials = list(/datum/material/iron = 5500)
build_path = /obj/item/clothing/head/foilhat
category = list("hacked", "Misc")
+
+/datum/design/c32acp
+ name = "Pistol Bullet (.32)"
+ id = "c32acp"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 500)
+ build_path = /obj/item/ammo_casing/c32acp
+ category = list("hacked", "Security")
+
+/////////////////
+// Magazines //
+/////////////////
+
+/datum/design/m32acp
+ name = "Empty .32 Magazine"
+ id = "m32acp"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 10000)
+ build_path = /obj/item/ammo_box/magazine/m32acp/empty
+ category = list("hacked", "Security")
diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm
index ea73df568f..320f856b35 100644
--- a/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm
+++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm
@@ -281,3 +281,10 @@
build_path = /obj/item/weaponcrafting/improvised_parts/trigger_assembly
category = list("initial", "Misc")
+/datum/design/focusing_lens
+ name = "Makeshift Lens"
+ id = "makeshift_lens"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 2000, /datum/material/glass = 4000)
+ build_path = /obj/item/weaponcrafting/improvised_parts/makeshift_lens
+ category = list("initial", "Misc")
diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm
index 2b2d11e54f..4a52e446bc 100644
--- a/code/modules/surgery/advanced/lobotomy.dm
+++ b/code/modules/surgery/advanced/lobotomy.dm
@@ -1,6 +1,6 @@
/datum/surgery/advanced/lobotomy
name = "Lobotomy"
- desc = "An invasive surgical procedure which guarantees removal of almost all brain traumas, but might cause another permanent trauma in return."
+ desc = "An invasive surgical procedure which guarantees removal of almost all brain traumas, at the cost of severe, albeit repairable, brain damage."
steps = list(
/datum/surgery_step/incise,
/datum/surgery_step/retract_skin,
@@ -43,11 +43,14 @@
target.mind.remove_antag_datum(/datum/antagonist/brainwashed)
switch(rand(1,6))//Now let's see what hopefully-not-important part of the brain we cut off
if(1)
- target.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_MAGIC)
+ target.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_SURGERY)
if(2)
- target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_MAGIC)
+ target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_SURGERY)
if(3)
- target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_MAGIC)
+ target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_SURGERY)
+ // you're cutting off a part of the brain.w
+ var/obj/item/organ/brain/B = target.getorganslot(ORGAN_SLOT_BRAIN)
+ B.applyOrganDamage(50, 100)
return TRUE
/datum/surgery_step/lobotomize/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -59,11 +62,11 @@
B.applyOrganDamage(80)
switch(rand(1,3))
if(1)
- target.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_MAGIC)
+ target.gain_trauma_type(BRAIN_TRAUMA_MILD, TRAUMA_RESILIENCE_LOBOTOMY)
if(2)
- target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_MAGIC)
+ target.gain_trauma_type(BRAIN_TRAUMA_SEVERE, TRAUMA_RESILIENCE_LOBOTOMY)
if(3)
- target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_MAGIC)
+ target.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, TRAUMA_RESILIENCE_LOBOTOMY)
else
user.visible_message("
[user] suddenly notices that the brain [user.p_they()] [user.p_were()] working on is not there anymore.", "You suddenly notice that the brain you were working on is not there anymore.")
return FALSE
diff --git a/code/modules/vehicles/cars/car.dm b/code/modules/vehicles/cars/car.dm
index 958a4e65c4..d45cb8d26f 100644
--- a/code/modules/vehicles/cars/car.dm
+++ b/code/modules/vehicles/cars/car.dm
@@ -49,7 +49,7 @@
mob_exit(M, silent)
return TRUE
-/obj/vehicle/sealed/car/attacked_by(obj/item/I, mob/living/user)
+/obj/vehicle/sealed/car/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
if(!I.force)
return FALSE
if(occupants[user])
@@ -85,4 +85,4 @@
if(!silent)
M.visible_message("[M] is forced into \the [src]!")
M.forceMove(src)
- add_occupant(M, VEHICLE_CONTROL_KIDNAPPED)
\ No newline at end of file
+ add_occupant(M, VEHICLE_CONTROL_KIDNAPPED)
diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index 2b9890b863..cd21b61dbe 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -36,7 +36,7 @@
visible_message("[src] spews out a ton of space lube!")
new /obj/effect/particle_effect/foam(loc) //YEET
-/obj/vehicle/sealed/car/clowncar/attacked_by(obj/item/I, mob/living/user)
+/obj/vehicle/sealed/car/clowncar/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
. = ..()
if(istype(I, /obj/item/reagent_containers/food/snacks/grown/banana))
var/obj/item/reagent_containers/food/snacks/grown/banana/banana = I
@@ -129,4 +129,4 @@
icon_state = initial(icon_state)
/obj/vehicle/sealed/car/clowncar/proc/StopDroppingOil()
- droppingoil = FALSE
\ No newline at end of file
+ droppingoil = FALSE
diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm
index ddd7736522..92e40bc3a8 100644
--- a/code/modules/vending/assist.dm
+++ b/code/modules/vending/assist.dm
@@ -14,7 +14,8 @@
/obj/item/stock_parts/cell/upgraded = 2)
premium = list(/obj/item/stock_parts/cell/upgraded/plus = 2,
/obj/item/flashlight/lantern = 2,
- /obj/item/beacon = 2)
+ /obj/item/beacon = 2,
+ /obj/item/airlock_painter/decal = 5)
product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
refill_canister = /obj/item/vending_refill/assist
@@ -24,4 +25,4 @@
payment_department = NO_FREEBIES
/obj/item/vending_refill/assist
- icon_state = "refill_engi"
\ No newline at end of file
+ icon_state = "refill_engi"
diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm
index a0248d2d12..50e0fb9cde 100644
--- a/code/modules/vending/engivend.dm
+++ b/code/modules/vending/engivend.dm
@@ -15,6 +15,7 @@
/obj/item/electronics/airalarm = 10,
/obj/item/electronics/firealarm = 10,
/obj/item/electronics/firelock = 10,
+ /obj/item/airlock_painter/decal = 5,
/obj/item/rcd_ammo = 3
)
contraband = list(/obj/item/stock_parts/cell/potato = 3,
@@ -35,4 +36,4 @@
cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
/obj/item/vending_refill/engivend
- icon_state = "refill_engi"
\ No newline at end of file
+ icon_state = "refill_engi"
diff --git a/code/modules/vending/kinkmate.dm b/code/modules/vending/kinkmate.dm
index c647964c63..24fb685eac 100644
--- a/code/modules/vending/kinkmate.dm
+++ b/code/modules/vending/kinkmate.dm
@@ -20,7 +20,11 @@
/obj/item/clothing/under/misc/gear_harness = 10,
/obj/item/dildo/custom = 5,
/obj/item/electropack/shockcollar = 3,
- /obj/item/assembly/signaler = 3
+ /obj/item/assembly/signaler = 3,
+ /obj/item/clothing/under/shorts/polychromic/pantsu,
+ /obj/item/clothing/under/misc/poly_bottomless,
+ /obj/item/clothing/under/misc/poly_tanktop,
+ /obj/item/clothing/under/misc/poly_tanktop/female
)
contraband = list(
/obj/item/clothing/neck/petcollar/locked = 2,
diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm
index c59020d3a4..c936d9c32c 100644
--- a/code/modules/vending/youtool.dm
+++ b/code/modules/vending/youtool.dm
@@ -18,7 +18,8 @@
/obj/item/clothing/gloves/color/fyellow = 4,
/obj/item/multitool = 2)
premium = list(/obj/item/clothing/gloves/color/yellow = 2,
- /obj/item/weldingtool/hugetank = 2)
+ /obj/item/weldingtool/hugetank = 2,
+ /obj/item/airlock_painter/decal = 3)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
refill_canister = /obj/item/vending_refill/tool
resistance_flags = FIRE_PROOF
@@ -28,4 +29,4 @@
cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
/obj/item/vending_refill/tool
- icon_state = "refill_engi"
\ No newline at end of file
+ icon_state = "refill_engi"
diff --git a/config/plushies/defines.txt b/config/plushies/defines.txt
index e69de29bb2..e7a92f6ac2 100644
--- a/config/plushies/defines.txt
+++ b/config/plushies/defines.txt
@@ -0,0 +1,2 @@
+# EXAMPLE
+# SNOWFLAKE_PLUSHIES example {"name":"example","desc":"thanks, coders.","icon_state":"","attack_verb":["thumped","whomped","bumped"],"squeak_override":{"sound/weapons/magout.ogg":1}}
diff --git a/config/plushies/plushie_config.txt b/config/plushies/plushie_config.txt
deleted file mode 100644
index 7cd1d88f3e..0000000000
--- a/config/plushies/plushie_config.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# EXAMPLE
-# SNOWFLAKE_PLUSHIES example {"name":"example","desc":"thanks, coders.","icon_state":"","attack_verb":["thumped","whomped","bumped"],"squeak_override":{"sound/weapons/magout.ogg":1}}
diff --git a/html/changelog.html b/html/changelog.html
index 0f38f090b7..ce00531001 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,91 @@
-->
+
15 June 2020
+
Anturk, kevinz000 updated:
+
+ - VV now properly allows access to datums in associative lists
+ - SDQL2 printout has been upgraded for the 5th time.
+
+
kevinz000 updated:
+
+ - plushies now work. credits to timothytea.
+ - You can now tape knives to cleanbots
+
+
kevinz000 (port from VOREStation) updated:
+
+ - Ported zoomba skins for cyborgs.
+
+
+
14 June 2020
+
Bhijn updated:
+
+ - raw HTML can no longer be used in flavortext
+ - Added Lesbian Visibility Day (April 26th)
+ - Added Bisexual Visibility Day (September 23rd)
+ - Added Coming Out Day! (October 11th)
+ - Added Intersex Awareness Day (October 26th)
+ - Added Transgender Awareness Week (November 13th - 19th)
+ - Added the Transgender Day of Remembrance (November 20th)
+ - Added Asexual Awareness Week (Last full week of October, this year it'll be Oct. 25-31)
+ - Added the Stonewall Riot Anniversary (June 28)
+ - Moth week is now *actually* the last full week of July, instead of the 4th of every weekday + the 5th Sunday.
+
+
Floof Ball / Kathrin Morrison / Floof Ball#0798 updated:
+
+ - Improvised Pistol + 32 ACP ammo.
+ - Improvised Energy Gun. Fires 5 shots of 10 burn damage each. Can be upgraded with a lens made from glassworking and T4 parts for a minor buff.
+ - Ammo + gun part loot spawners for mappers.
+ - New sprites for Improvised Rifle, the ability to sling the rifle and a sprite for that.
+ - New sprites for the Improvised Shotgun and its sling sprite.
+ - Improvised shotguns are now two-handed only.
+ - Improvised shotguns now only have a much less harsh 0.9* modifier, keeping them two hits to crit with slugs and buckshot. It can no longer be dual-wielded but can still be sawn off for w_class medium (can fit in backpacks).
+ - Missing handsaw icons added in.
+ - Crafting table cleaned up into sections.
+
+
Ghommie updated:
+
+ - changed the weak attack message prefix from "inefficiently" to "limply", "feebly" and "saplessly" and lowered the threshold.
+ - Fixing old beserker hardsuits having the wrong helmet type.
+
+
The0bserver and Stewydeadmike updated:
+
+ - Hey, there's a bit of dust in this recipe book! Recipes using peas? How many recipes does this book even have?
+ - Adds 6 new food items, and 1 new consumable reagent using all forms of the recently discovered peas. Ask your local botanist and chef for them today!
+
+
YakumoChen updated:
+
+ - Adds polychrome options to loadout
+ - Adds risque polychrome options to Kinkmate vendors
+
+
kevinz000 updated:
+
+ - emissive blockers can no longer be radioactive.
+ - Ghosts can now scan air inside most objects that contain air by clicking on them.
+ - Directional blocking has been added, keybound to G. This will reduce a portion of incoming damage if done with eligible items at the cost of stamina damage incurred to the user based on damage blocked as well as while active, as well as in most cases preventing the user from doing any attacks while this is active.
+ - Parrying has been added, keybound to F. Timing-based counterattacks, effect heavily dependent on the item, WIP.
+ - Disks are now smaller.
+
+
+
12 June 2020
+
EmeraldSundisk updated:
+
+ - The Detective's Office has been commandeered in order to serve a Head of Security. Detectives will find their new office within starboard maintenance.
+ - Adds the Head of Security's standard equipment to their new office.
+ - Slight adjustment/expansion to the main security department
+ - Additional maintenance work
+
+
timothyteakettle updated:
+
+ - Crabs, cockroaches, slimes and crabs are now small enough to fit in pet carriers
+
+
+
11 June 2020
+
Ghommie updated:
+
+ - Balanced vending machine prices to be generally more affordable, a minority has been priced up though.
+
+
10 June 2020
DeltaFire15 updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index fbe6f85c08..a25fb6595c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -25505,9 +25505,29 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
all the quirky little soulbits.
- bugfix: box brig miscellaneous issues
- bugfix: box station hos office
-2020-04-09:
+2020-04-15:
+ Arturlang:
+ - rscadd: Adds garlic, a mutation of onions
+ - rscadd: You can now make garlic necklaces.
+ - tweak: Tweaked hunger to be more the same as blood level for bloodsuckers
+ - tweak: Bloodsuckers no longer get zero healing from regenerative cores, the core
+ now heals their wounds but not their blood.
+ - balance: Bloodsucker heal is now based a lot more on blood level.
+ - bugfix: You can no longer be effectively immortal when fully auged as a bloodsucker.
+ - bugfix: Regenerative cores will regain their old names when they are renewed,
+ no more working decayed cores.
+ - code_imp: Removes a lot of unnecesiry clutter of comments and tries to make the
+ vars more consistent for bloodsucker code.
+ - code_imp: Made the regenerative core use one proc instead of copypasta
+ Auris456852:
+ - rscadd: Added printer sound for admins that plays when someone messages Centcomm
+ or the Syndicate. Just like RP!
Bhijn:
- admin: The traitor panel now actually shows a list of contractor targets.
+ - server: Fail2Topic now supports Linux. Do beware that this requires some sysop
+ experience to properly set up!
+ - config: Fail2Topic is now disabled by default, and the out-of-the-box config files
+ have been updated to be a little more detailed.
- rscadd: Added a lfwb-inspired orbiting pixel + flashing outline animation to the
sprint and combat mode buttons. This can be toggled via the preferences menu,
and is completely independent from all HUD themes.
@@ -25528,9 +25548,14 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
has come to an end.
- rscadd: Underwear now fulfills its purpose.
- rscadd: Privates visibility preferences.
+ - refactor: refactored polychromic clothing into an element.
- tweak: Blacklists unsynthetizable reagents from botany bees honey production.
+ - bugfix: Fixed toilet cistern loot spawning on the floor.
- tweak: The megafauna's hitbox doesn't include 0 alpha sections anymore.
+ - bugfix: Wizard robes & co work again now.
+ - bugfix: Fixed some spell casting message spam.
- rscadd: Added M/F body preferences.
+ - bugfix: fixed yet another few airless issues with the space hermit ruin.
- bugfix: Intellectual property infringment is not cool.
- bugfix: Near-station nuclear explosions now display the on-station nuke explosion
cinematic, consistently with its clearance of the station level and its nuclear
@@ -25538,17 +25563,32 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- balance: Nuclear bombs can't be anchored in space areas (not just turfs) anymore,
as a quick effortless way to discourage players from anchoring the device on
the edge of the map.
+ - bugfix: Fixed a whacky miniature cell duping issue.
+ - bugfix: Liver failure is back!
+ - tweak: standarized a few (prefs off) side effects from enlargment chems on livers
+ to do organ damage instead without the blood volume whackiness.
+ - tweak: High liver damage now slows mobs down.
- bugfix: Fixing an issue with the split personality removing the original owner
from the round if the body died while the stranger was in control.
+ - bugfix: fixed a few floaty sprite accessories.
- bugfix: Fixed a few mutations not working correctly.
+ - bugfix: Fixed the phantom thief component, again.
- refactor: Made votes obfuscation settings more robust.
- admin: Also included them in custom votes.
- tweak: The map rotation vote will only hide ongoing votes now, not the results.
+ - balance: The crusher's vortex talisman trophy now has a cooldown between each
+ spawned wall.
+ - refactor: Backend body size preferences.
- bugfix: Infiltrator's boots don't stop slips and "space wind" through the power
of runtime errors anymore, and properly silence the user's footsteps now.
- tweak: Chaplains are now inelegible for bloodsuckers.
- bugfix: Fixed crafting hud icon overlapping the second pocket on 1:1 screen mode.
- code_imp: Removed some dead flightsuit code leftovers.
+ - rscadd: Reenabled the swarmers event. Also blacklisted another dozen other machineries
+ and structures that may be critical to the shift or station integrity from swarmers'
+ HUNGER for materials.
+ - bugfix: Fixed find_safe_turfs() searching for turfs with concentration of oxygen
+ lower than 16 rather higher.
KathrinBailey:
- rscadd: Radiation shuttesr to all supermatters.
- rscadd: Windowed shutters to armouries where relevant.
@@ -25605,8 +25645,12 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
curve for threat level.
- tweak: '"Chaotic" storyteller now simply ramps up threat level as round goes on.'
- rscadd: '"Classic" storyteller, basically doing what "random" did before.'
+ - rscadd: Latejoin changelings for dynamic
+ - bugfix: Average threat calculation works now
+ - bugfix: Contamination is back.
Seris02:
- balance: stops hijackers from being able to remotely blow up borgs
+ - rscadd: wall walking boots
- bugfix: made color picking for character appearance show the colors when you pick
them
- tweak: the sergal markings
@@ -25616,6 +25660,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: Ports over TG's Mortars and Pestles.
- balance: Water, Holywater and Unholywater will now now quickly purge itself if
you have 151u in your system
+ - rscadd: Most crate types can now be made, some costing more do to function over
+ fashion
- rscadd: Medical Mechs syringe gun now knows many more life saving chems, like
Insulin, Dexalin, Prussian Blue, Kelotane and Bicaridine
- balance: torches take less staminda to use.
@@ -25633,6 +25679,9 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Xantholne:
- bugfix: bumbles will stop sleeping so much
actioninja:
+ - rscadd: Washing machines now support arbitrary dye color
+ - rscadd: Washing machines now dye nearly every item.
+ - refactor: lots of backend changes to clothing overlays, report any issues
- rscadd: Better glowing lights
actioninja (ported by Ghommie):
- refactor: repathed all under clothing, keep an eye out for errors.
@@ -25647,6 +25696,9 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
now
- rscdel: quarters that found their way out of the quartermaster's back room
kappa-sama:
+ - rscdel: normies can no longer steal circuit codes
+ - balance: doubles the Stam damage of nonlethal krav stompers
+ - bugfix: no longer Krav Maga stomp people that are standing
- balance: no more 20pop requirement for noslips
keronshb:
- tweak: Reverts Mining Base RNG Placement
@@ -25661,6 +25713,10 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- bugfix: turfs properly initialize atom colors if they're colored.
- tweak: cloners now stabilize mutations while someone's cloning, meaning active
genes will not life tick.
+ - code_imp: datum/pipeline return_air stack trace now gives a reference so it's
+ actually marginally useful if caught in round.
+ - rscadd: Volumetric storage is here.
+ - rscadd: Traitor chaplains can now become neutered versions of cults.
- bugfix: beams should no longer go across the map and mess everything up if their
source or target isn't on a turf.
kiwedespars:
@@ -25687,6 +25743,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- balance: Scatterlaser is now in-line with buckshot. Nukies can't purchase scatterlaser
shot.
- rscdel: Null crates are no longer available in cargo!
+ - bugfix: Sleeping Carp and Rising Bass now dodge. Again.
- bugfix: Russian Revolver can no longer be exploited for a free 357.
- balance: Several guns now shoot exactly where you click regardless of movement
or turning.
@@ -25709,3 +25766,196 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- bugfix: insidious balaclava muzzlepsprite works
- rscadd: You can now choose your name and color as a holoparasite/guardian/holocarp!
- bugfix: fixes lings being able to get mechanical holoparasites
+2020-04-16:
+ ForrestWick:
+ - tweak: changed a certain item to be called meatball, ended racism, thank you obama
+ Linzolle:
+ - tweak: remove any slurs, etc. to comply with GitHub's ToS
+2020-04-19:
+ Anonymous:
+ - rscadd: Xenohybrids will now scream like xeno.
+ Arturlang:
+ - bugfix: You can no longer spam craft things using the crafting menu
+ Detective-Google:
+ - bugfix: uncorks some of Lambda's rooms.
+ Ghommie:
+ - rscadd: Custom skin tone preferences.
+ - tweak: Normalized box dorm lockers. Also removed a straight jacket found in the
+ same area.
+ Jake Park:
+ - bugfix: fixed path name for youtool vending
+ Putnam3145:
+ - bugfix: Objectives now clean theirselves up instead of leaving null entries in
+ lists everywhere.
+ Seris02:
+ - bugfix: stops magboots from not updating slowdowns
+ Trilbyspaceclone:
+ - rscadd: Maints have seen an uptick in left over types of welders, and tools. As
+ well as different types of masks
+ - rscadd: New type of 02 locker - Rng! It can have almost any type of gas/breath
+ mask and almost any type of o2 tank as well as even plasma men internals - Fancy!
+ - tweak: Tool lockers have 70% odds to have a spare random tool inside!
+ - rscadd: 12 new more drinks for most races!
+ - rscadd: New animations for mauna loa, and colour swap from red to blue for a Paramedic
+ Hardsuit helm
+ - tweak: Lowers cog champ ((the drink)) flare rate
+ - rscadd: Six more Sci based bounties have been posted at your local Cargo Bounty
+ Request console
+ - bugfix: Mimes have made catnip plants not become invisible. How helpful.
+ - rscadd: Honey Palm now distills into mead rather then wine
+ UristMcAstronaut:
+ - rscadd: Adds circuit analyzers to maps and to integrated circuit printer and circuitry
+ starter crate.
+ kappa-sama:
+ - balance: aranesp heals 10 instead of 18 stamina per tick
+ - rscdel: removed roundstart hyper earrape screams from xenohybrids
+ kevinz000:
+ - bugfix: you can no longer stun xenos
+ - balance: Contractor kits are now poplocked to 30 players.
+ - rscadd: Shield bashing has been added
+ necromanceranne:
+ - rscadd: You can now craft armwraps!
+ - balance: Pugilists disarm you more easily and are harder to disarm. They also
+ get a discount on disarm.
+ - balance: Pugilists only suffer a flat 10% chance to miss you. It's just like old
+ punches! Kinda.
+ - balance: Chaplain's armbands are a +2, up from a +1!
+ - balance: Martial artists spend stamina when they disarm.
+ - balance: Rising Bass had several moves shortened and made stronger. Has a disarm
+ override attack which does stamina damage and trips people on a disarm stun
+ punch.
+ - balance: CQC had it's disarm move altered to be a stronger version of Krav Maga's.
+ Dizzies and disarms on a disarm stun punch or just does some stamina damage
+ and brute damage.
+ - balance: Sleeping Carp can punch you to the floor on a harm stun punch.
+ - bugfix: Hugs of the Northstar are no longer nodrop.
+ - bugfix: Adding in some overrides and proper flag checks for martial arts.
+ - bugfix: Stun thresholding stops disarm spams at extremely high stamina loss.
+ - tweak: Ashen Arrows are actually called Ashen Arrows in the crafting menu.
+2020-06-08:
+ DeltaFire15:
+ - bugfix: Delinging now properly removes their special role
+ - balance: Keycard auth devices now require two seperate IDs with sufficient access
+ to auth.
+ Linzolle:
+ - bugfix: shotguns no longer delete chambered shells while firing
+ kevinz000:
+ - rscadd: test
+ - rscdel: test
+ shellspeed1:
+ - rscadd: Internal tanks are now printable at the engineering lathe.
+ timothyteakettle:
+ - bugfix: newly created areas using blueprints now maintain the previous areas noteleport
+ value
+ - bugfix: kudzu seeds now actually spawn vines
+2020-06-09:
+ Anonymous:
+ - rscadd: Added Orville-inspired clothing as a worthy alternative to Trek stuff.
+ - tweak: Adds chaplain role allowance to the TMP Service Uniform loadout.
+ - tweak: Adds paramedic in every medsci mentioned uniform loadout.
+ DeltaFire15:
+ - bugfix: Offstation AIs can once again only interact with their z-level
+ Ghommie:
+ - bugfix: Fixing IC material containers interaction with stacks, for real.
+ Trilbyspaceclone:
+ - tweak: Gasses like BZ and Masiam seem to just sell for less in cargo, markets
+ seem to change it seems
+ kevinz000:
+ - balance: plantpeople should stop dying in the halls now
+ - rscadd: Modifier-independent hotkey bindings have been added.
+2020-06-10:
+ DeltaFire15:
+ - bugfix: Golems / simillar now inherit the neutered antag datum if the creator
+ is neutered.
+ Ghommie:
+ - bugfix: Fixing missing pill type buttons from the chem master UI.
+ Naksu:
+ - code_imp: Lighting corner updates are ever so slightly faster.
+ Putnam for helping me code the contamination clearing on people:
+ - rscadd: Lab made Zeolites have been remade anew and more affective now that they
+ refined the best possable way to mix and make a supper Zeolite capable of clearing
+ contamination form not only people but items!
+ Trilbyspaceclone:
+ - tweak: Tank Dispender has been moved into toxin storage from toxins
+ kevinz000:
+ - rscadd: traitor classes can now be poplocked. hijack/glorious death are now locked
+ to 25/20 respectively.
+ timothyteakettle:
+ - rscadd: adds a new fermichem, used for creating sentient plushies!
+ - rscadd: Mice can now breed using cheese wedges
+ - rscadd: Royal cheese can be crafted to convert a mouse into king rat
+2020-06-11:
+ Ghommie:
+ - balance: Balanced vending machine prices to be generally more affordable, a minority
+ has been priced up though.
+2020-06-12:
+ EmeraldSundisk:
+ - tweak: The Detective's Office has been commandeered in order to serve a Head of
+ Security. Detectives will find their new office within starboard maintenance.
+ - rscadd: Adds the Head of Security's standard equipment to their new office.
+ - tweak: Slight adjustment/expansion to the main security department
+ - rscadd: Additional maintenance work
+ timothyteakettle:
+ - rscadd: Crabs, cockroaches, slimes and crabs are now small enough to fit in pet
+ carriers
+2020-06-14:
+ Bhijn:
+ - bugfix: raw HTML can no longer be used in flavortext
+ - rscadd: Added Lesbian Visibility Day (April 26th)
+ - rscadd: Added Bisexual Visibility Day (September 23rd)
+ - rscadd: Added Coming Out Day! (October 11th)
+ - rscadd: Added Intersex Awareness Day (October 26th)
+ - rscadd: Added Transgender Awareness Week (November 13th - 19th)
+ - rscadd: Added the Transgender Day of Remembrance (November 20th)
+ - rscadd: Added Asexual Awareness Week (Last full week of October, this year it'll
+ be Oct. 25-31)
+ - rscadd: Added the Stonewall Riot Anniversary (June 28)
+ - bugfix: Moth week is now *actually* the last full week of July, instead of the
+ 4th of every weekday + the 5th Sunday.
+ Floof Ball / Kathrin Morrison / Floof Ball#0798:
+ - rscadd: Improvised Pistol + 32 ACP ammo.
+ - rscadd: Improvised Energy Gun. Fires 5 shots of 10 burn damage each. Can be upgraded
+ with a lens made from glassworking and T4 parts for a minor buff.
+ - rscadd: Ammo + gun part loot spawners for mappers.
+ - rscadd: New sprites for Improvised Rifle, the ability to sling the rifle and a
+ sprite for that.
+ - rscadd: New sprites for the Improvised Shotgun and its sling sprite.
+ - balance: Improvised shotguns are now two-handed only.
+ - balance: Improvised shotguns now only have a much less harsh 0.9* modifier, keeping
+ them two hits to crit with slugs and buckshot. It can no longer be dual-wielded
+ but can still be sawn off for w_class medium (can fit in backpacks).
+ - bugfix: Missing handsaw icons added in.
+ - tweak: Crafting table cleaned up into sections.
+ Ghommie:
+ - tweak: changed the weak attack message prefix from "inefficiently" to "limply",
+ "feebly" and "saplessly" and lowered the threshold.
+ - bugfix: Fixing old beserker hardsuits having the wrong helmet type.
+ The0bserver and Stewydeadmike:
+ - rscadd: Hey, there's a bit of dust in this recipe book! Recipes using peas? How
+ many recipes does this book even have?
+ - rscadd: Adds 6 new food items, and 1 new consumable reagent using all forms of
+ the recently discovered peas. Ask your local botanist and chef for them today!
+ YakumoChen:
+ - tweak: Adds polychrome options to loadout
+ - tweak: Adds risque polychrome options to Kinkmate vendors
+ kevinz000:
+ - bugfix: emissive blockers can no longer be radioactive.
+ - rscadd: Ghosts can now scan air inside most objects that contain air by clicking
+ on them.
+ - rscadd: Directional blocking has been added, keybound to G. This will reduce a
+ portion of incoming damage if done with eligible items at the cost of stamina
+ damage incurred to the user based on damage blocked as well as while active,
+ as well as in most cases preventing the user from doing any attacks while this
+ is active.
+ - rscadd: Parrying has been added, keybound to F. Timing-based counterattacks, effect
+ heavily dependent on the item, WIP.
+ - balance: Disks are now smaller.
+2020-06-15:
+ Anturk, kevinz000:
+ - bugfix: VV now properly allows access to datums in associative lists
+ - rscadd: SDQL2 printout has been upgraded for the 5th time.
+ kevinz000:
+ - bugfix: plushies now work. credits to timothytea.
+ - rscadd: You can now tape knives to cleanbots
+ kevinz000 (port from VOREStation):
+ - imageadd: Ported zoomba skins for cyborgs.
diff --git a/html/changelogs/AutoChangeLog-pr-12375.yml b/html/changelogs/AutoChangeLog-pr-12375.yml
new file mode 100644
index 0000000000..9d9b79a3a6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12375.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "You can't blink nor use LOOC/AOOC as a petrified statue anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-12393.yml b/html/changelogs/AutoChangeLog-pr-12393.yml
new file mode 100644
index 0000000000..28136bed22
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12393.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - tweak: "BEPIS decal painter has been moved to venders, replacing it being the flashdark"
diff --git a/html/changelogs/AutoChangeLog-pr-12495.yml b/html/changelogs/AutoChangeLog-pr-12495.yml
deleted file mode 100644
index c3ac32debb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12495.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - balance: "Balanced vending machine prices to be generally more affordable, a minority has been priced up though."
diff --git a/html/changelogs/AutoChangeLog-pr-12509.yml b/html/changelogs/AutoChangeLog-pr-12509.yml
new file mode 100644
index 0000000000..a5e13bada0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12509.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - rscadd: "slimes can now change their color using alter form"
diff --git a/html/changelogs/AutoChangeLog-pr-12518.yml b/html/changelogs/AutoChangeLog-pr-12518.yml
new file mode 100644
index 0000000000..91580faf20
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12518.yml
@@ -0,0 +1,5 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - refactor: "projectile ricochets now use a less hilariously terrible way of being handled and should be easier to w"
+ - bugfix: "projectile runtime/ricocheting"
diff --git a/html/changelogs/AutoChangeLog-pr-12520.yml b/html/changelogs/AutoChangeLog-pr-12520.yml
new file mode 100644
index 0000000000..22890dc4fd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12520.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - balance: "Lobotomy no longer has a 50% chance of giving you a nigh-unremovable trauma, but does 50 brain damage even on success. On failure, it will give you a lobotomy-class trauma."
diff --git a/html/changelogs/AutoChangeLog-pr-12521.yml b/html/changelogs/AutoChangeLog-pr-12521.yml
new file mode 100644
index 0000000000..1977538e26
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12521.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - balance: "spinesnapping from tackling now only gives a lobotomy class trauma instead of magic."
diff --git a/html/changelogs/AutoChangeLog-pr-12523.yml b/html/changelogs/AutoChangeLog-pr-12523.yml
new file mode 100644
index 0000000000..58f1c7fe28
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12523.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - bugfix: "Food carts now function as intended, allowing the pouring and mixing of drinks."
diff --git a/icons/effects/block_parry.dmi b/icons/effects/block_parry.dmi
new file mode 100644
index 0000000000..4a0ade5e61
Binary files /dev/null and b/icons/effects/block_parry.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index d307b5b6c9..0a1372ac2b 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 082bfb3c3e..9bb41bf527 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index c75afde4cc..bebb625440 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/food/donut.dmi b/icons/obj/food/donut.dmi
index 395739eccc..534e0e37bc 100644
Binary files a/icons/obj/food/donut.dmi and b/icons/obj/food/donut.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 641bd61018..e7196190cf 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi
index fd47e89aa8..378927e8f9 100644
Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 691d5c8362..33872719fe 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/guns/gun_parts.dmi b/icons/obj/guns/gun_parts.dmi
index 8e3168769d..7f088f6af5 100644
Binary files a/icons/obj/guns/gun_parts.dmi and b/icons/obj/guns/gun_parts.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 5c8fab82e8..8c50e7da27 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 0ff7d4a607..90eea65cb3 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm
index a4d6c2cd09..e667626968 100644
--- a/modular_citadel/code/modules/client/loadout/uniform.dm
+++ b/modular_citadel/code/modules/client/loadout/uniform.dm
@@ -254,6 +254,30 @@
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/misc/keyholesweater
+/datum/gear/polyjump
+ name = "Polychromic Jumpsuit"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/misc/polyjumpsuit
+ cost = 2
+
+/datum/gear/polyskirt
+ name = "Polychromic Jumpskirt"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/dress/skirt/polychromic
+ cost = 2
+
+/datum/gear/polysuit
+ name = "Polychromic Button-up Shirt"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/misc/poly_shirt
+ cost = 3
+
+/datum/gear/polypleated
+ name = "Polychromic Pleated Sweaterskirt"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/dress/skirt/polychromic/pleated
+ cost = 3
+
/datum/gear/polykilt
name = "Polychromic Kilt"
category = SLOT_W_UNIFORM
diff --git a/sound/block_parry/block_metal1.ogg b/sound/block_parry/block_metal1.ogg
new file mode 100644
index 0000000000..c0f98249cd
Binary files /dev/null and b/sound/block_parry/block_metal1.ogg differ
diff --git a/sound/block_parry/block_metal2.ogg b/sound/block_parry/block_metal2.ogg
new file mode 100644
index 0000000000..58c1233cea
Binary files /dev/null and b/sound/block_parry/block_metal2.ogg differ
diff --git a/sound/block_parry/block_wood1.ogg b/sound/block_parry/block_wood1.ogg
new file mode 100644
index 0000000000..a01f3dbe01
Binary files /dev/null and b/sound/block_parry/block_wood1.ogg differ
diff --git a/sound/block_parry/block_wood2.ogg b/sound/block_parry/block_wood2.ogg
new file mode 100644
index 0000000000..398a59e248
Binary files /dev/null and b/sound/block_parry/block_wood2.ogg differ
diff --git a/sound/block_parry/sfx-parry.ogg b/sound/block_parry/sfx-parry.ogg
new file mode 100644
index 0000000000..3429031bd9
Binary files /dev/null and b/sound/block_parry/sfx-parry.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index 4e8b060faf..ae27de2d30 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -48,7 +48,6 @@
#include "code\__DEFINES\events.dm"
#include "code\__DEFINES\exports.dm"
#include "code\__DEFINES\fantasy_affixes.dm"
-#include "code\__DEFINES\flags.dm"
#include "code\__DEFINES\food.dm"
#include "code\__DEFINES\footsteps.dm"
#include "code\__DEFINES\hud.dm"
@@ -77,7 +76,6 @@
#include "code\__DEFINES\movespeed_modification.dm"
#include "code\__DEFINES\nanites.dm"
#include "code\__DEFINES\networks.dm"
-#include "code\__DEFINES\obj_flags.dm"
#include "code\__DEFINES\pinpointers.dm"
#include "code\__DEFINES\pipe_construction.dm"
#include "code\__DEFINES\pool.dm"
@@ -85,6 +83,7 @@
#include "code\__DEFINES\preferences.dm"
#include "code\__DEFINES\procpath.dm"
#include "code\__DEFINES\profile.dm"
+#include "code\__DEFINES\projectiles.dm"
#include "code\__DEFINES\qdel.dm"
#include "code\__DEFINES\radiation.dm"
#include "code\__DEFINES\radio.dm"
@@ -119,10 +118,17 @@
#include "code\__DEFINES\vv.dm"
#include "code\__DEFINES\wall_dents.dm"
#include "code\__DEFINES\wires.dm"
+#include "code\__DEFINES\_flags\_flags.dm"
+#include "code\__DEFINES\_flags\item_flags.dm"
+#include "code\__DEFINES\_flags\obj_flags.dm"
#include "code\__DEFINES\admin\keybindings.dm"
+#include "code\__DEFINES\combat\attack_types.dm"
+#include "code\__DEFINES\combat\block.dm"
+#include "code\__DEFINES\combat\block_parry.dm"
#include "code\__DEFINES\dcs\flags.dm"
#include "code\__DEFINES\dcs\helpers.dm"
#include "code\__DEFINES\dcs\signals.dm"
+#include "code\__DEFINES\flags\do_after.dm"
#include "code\__DEFINES\flags\shields.dm"
#include "code\__DEFINES\mapping\maploader.dm"
#include "code\__DEFINES\material\worth.dm"
@@ -144,6 +150,7 @@
#include "code\__HELPERS\custom_holoforms.dm"
#include "code\__HELPERS\dates.dm"
#include "code\__HELPERS\dna.dm"
+#include "code\__HELPERS\do_after.dm"
#include "code\__HELPERS\donator_groupings.dm"
#include "code\__HELPERS\files.dm"
#include "code\__HELPERS\game.dm"
@@ -2166,6 +2173,7 @@
#include "code\modules\keybindings\keybind\admin.dm"
#include "code\modules\keybindings\keybind\carbon.dm"
#include "code\modules\keybindings\keybind\client.dm"
+#include "code\modules\keybindings\keybind\combat.dm"
#include "code\modules\keybindings\keybind\emote.dm"
#include "code\modules\keybindings\keybind\human.dm"
#include "code\modules\keybindings\keybind\living.dm"
@@ -2316,7 +2324,10 @@
#include "code\modules\mob\living\emote.dm"
#include "code\modules\mob\living\life.dm"
#include "code\modules\mob\living\living.dm"
+#include "code\modules\mob\living\living_active_block.dm"
+#include "code\modules\mob\living\living_active_parry.dm"
#include "code\modules\mob\living\living_block.dm"
+#include "code\modules\mob\living\living_blocking_parrying.dm"
#include "code\modules\mob\living\living_defense.dm"
#include "code\modules\mob\living\living_defines.dm"
#include "code\modules\mob\living\living_mobility.dm"