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 17eb51b154..2ca1b63b14 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -66,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
@@ -111,10 +119,13 @@
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
+ 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
@@ -143,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
@@ -313,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")
@@ -330,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)
@@ -344,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/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 50d1e44d2a..51c903ee16 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -29,6 +29,7 @@
var/body_color //brown, gray and white, leave blank for random
gold_core_spawnable = FRIENDLY_SPAWN
var/chew_probability = 1
+ faction = list("rat")
/mob/living/simple_animal/mouse/Initialize()
. = ..()
@@ -59,11 +60,15 @@
else
..(gibbed)
+
/mob/living/simple_animal/mouse/Crossed(AM as mob|obj)
if( ishuman(AM) )
if(!stat)
var/mob/M = AM
to_chat(M, "
[icon2html(src, M)] Squeak!")
+ if(istype(AM, /obj/item/reagent_containers/food/snacks/royalcheese))
+ evolve()
+ qdel(AM)
..()
/mob/living/simple_animal/mouse/handle_automated_action()
@@ -84,6 +89,40 @@
C.deconstruct()
visible_message("
[src] chews through the [C].")
+ for(var/obj/item/reagent_containers/food/snacks/cheesewedge/cheese in range(1, src))
+ if(prob(10))
+ be_fruitful()
+ qdel(cheese)
+ return
+ for(var/obj/item/reagent_containers/food/snacks/royalcheese/bigcheese in range(1, src))
+ qdel(bigcheese)
+ evolve()
+ return
+
+/**
+ *Checks the mouse cap, if it's above the cap, doesn't spawn a mouse. If below, spawns a mouse and adds it to cheeserats.
+ */
+
+/mob/living/simple_animal/mouse/proc/be_fruitful()
+ var/cap = CONFIG_GET(number/ratcap)
+ if(LAZYLEN(SSmobs.cheeserats) >= cap)
+ visible_message("
[src] carefully eats the cheese, hiding it from the [cap] mice on the station!")
+ return
+ var/mob/living/newmouse = new /mob/living/simple_animal/mouse(loc)
+ SSmobs.cheeserats += newmouse
+ visible_message("
[src] nibbles through the cheese, attracting another mouse!")
+
+/**
+ *Spawns a new regal rat, says some good jazz, and if sentient, transfers the relivant mind.
+ */
+/mob/living/simple_animal/mouse/proc/evolve()
+ var/mob/living/simple_animal/hostile/regalrat = new /mob/living/simple_animal/hostile/regalrat(loc)
+ visible_message("
[src] devours the cheese! He morphs into something... greater!")
+ regalrat.say("RISE, MY SUBJECTS! SCREEEEEEE!")
+ if(mind)
+ mind.transfer_to(regalrat)
+ qdel(src)
+
/*
* Mouse types
*/
@@ -100,6 +139,10 @@
body_color = "brown"
icon_state = "mouse_brown"
+/mob/living/simple_animal/mouse/Destroy()
+ SSmobs.cheeserats -= src
+ return ..()
+
GLOBAL_VAR(tom_existed)
//TOM IS ALIVE! SQUEEEEEEEE~K :)
diff --git a/code/modules/mob/living/simple_animal/friendly/plushie.dm b/code/modules/mob/living/simple_animal/friendly/plushie.dm
new file mode 100644
index 0000000000..d992c704f5
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/friendly/plushie.dm
@@ -0,0 +1,79 @@
+//simplemob plushie that can be controlled by players
+/mob/living/simple_animal/pet/plushie
+ name = "Plushie"
+ desc = "A living plushie!"
+ icon = 'icons/obj/plushes.dmi'
+ icon_state = "debug"
+ icon_living = "debug"
+ icon_dead = "debug"
+ speak_emote = list("squeaks")
+ maxHealth = 50
+ health = 50
+ density = FALSE
+ pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+ mob_size = MOB_SIZE_TINY
+ mob_biotypes = MOB_ORGANIC
+ verb_say = "squeaks"
+ verb_ask = "squeaks inquisitively"
+ verb_exclaim = "squeaks intensely"
+ verb_yell = "squeaks intensely"
+ attack_sound = 'sound/items/toysqueak1.ogg'
+ attacked_sound = 'sound/items/toysqueak1.ogg'
+ melee_damage_type = STAMINA
+ melee_damage_lower = 0
+ melee_damage_upper = 1
+ attack_verb_continuous = "squeaks"
+ attack_verb_simple = "squeak"
+ deathmessage = "lets out a faint squeak as the glint in its eyes disappears"
+ footstep_type = FOOTSTEP_MOB_BAREFOOT
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 0
+ pressure_resistance = 200
+
+/mob/living/simple_animal/pet/plushie/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/mob_holder, "plushie")
+
+//shell that lets people turn into the plush or poll for ghosts
+/obj/item/toy/plushie_shell
+ name = "Plushie Shell"
+ desc = "A plushie. Its eyes seem to be staring right back at you. Something isn't quite right."
+ icon = 'icons/obj/plushes.dmi'
+ icon_state = "debug"
+ var/obj/item/toy/plush/stored_plush = null
+
+//attacking yourself transfers your mind into the plush!
+/obj/item/toy/plushie_shell/attack_self(mob/user)
+ if(user.mind)
+ var/safety = alert(user, "The plushie is staring back at you intensely, it seems cursed! (Permanently become a plushie)", "Hugging this is a bad idea.", "Hug it!", "Cancel")
+ if(safety == "Cancel" || !in_range(src, user))
+ return
+ to_chat(user, "
You hug the strange plushie. You fool.")
+
+ //setup the mob
+ var/mob/living/simple_animal/pet/plushie/new_plushie = new /mob/living/simple_animal/pet/plushie/(user.loc)
+ new_plushie.icon = src.icon
+ new_plushie.icon_living = src.icon_state
+ new_plushie.icon_dead = src.icon_state
+ new_plushie.icon_state = src.icon_state
+ new_plushie.name = src.name
+
+ //make the mob sentient
+ user.mind.transfer_to(new_plushie)
+
+ //add sounds to mob
+ new_plushie.AddComponent(/datum/component/squeak, stored_plush.squeak_override)
+ if(length(stored_plush.squeak_override) > 0)
+ new_plushie.attack_sound = stored_plush.squeak_override[1]
+ new_plushie.attacked_sound = stored_plush.squeak_override[1]
+
+ //take care of the user's old body and the old shell
+ user.dust(drop_items = TRUE)
+ qdel(src)
+
+//low regen over time
+/mob/living/simple_animal/pet/plushie/Life()
+ if(stat)
+ return
+ if(health < maxHealth)
+ heal_overall_damage(5) //Decent life regen, they're not able to hurt anyone so this shouldn't be an issue (butterbear for reference has 10 regen)
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/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
new file mode 100644
index 0000000000..e21514b37e
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
@@ -0,0 +1,239 @@
+/mob/living/simple_animal/hostile/regalrat
+ name = "regal rat"
+ desc = "An evolved rat, created through some strange science. It leads nearby rats with deadly efficiency to protect its kingdom. Not technically a king."
+ icon_state = "regalrat"
+ icon_living = "regalrat"
+ icon_dead = "regalrat_dead"
+ gender = NEUTER
+ speak_chance = 0
+ turns_per_move = 5
+ maxHealth = 70
+ health = 70
+ see_in_dark = 5
+ obj_damage = 10
+ butcher_results = list(/obj/item/clothing/head/crown = 1,)
+ response_help_continuous = "glares at"
+ response_help_simple = "glare at"
+ response_disarm_continuous = "skoffs at"
+ response_disarm_simple = "skoff at"
+ response_harm_continuous = "slashes"
+ response_harm_simple = "slash"
+ melee_damage_lower = 10
+ melee_damage_upper = 12
+ attack_verb_continuous = "slashes"
+ attack_verb_simple = "slash"
+ attack_sound = 'sound/weapons/punch1.ogg'
+ ventcrawler = VENTCRAWLER_ALWAYS
+ unique_name = TRUE
+ faction = list("rat")
+ var/datum/action/cooldown/coffer
+ var/datum/action/cooldown/riot
+ ///Number assigned to rats and mice, checked when determining infighting.
+
+/mob/living/simple_animal/hostile/regalrat/Initialize()
+ . = ..()
+ coffer = new /datum/action/cooldown/coffer
+ coffer.Grant(src)
+ riot = new /datum/action/cooldown/riot
+ riot.Grant(src)
+ var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the Royal Rat, cheesey be his crown?", ROLE_SENTIENCE, null, FALSE, 100, POLL_IGNORE_SENTIENCE_POTION)
+ if(LAZYLEN(candidates) && !mind)
+ var/mob/dead/observer/C = pick(candidates)
+ key = C.key
+ notify_ghosts("All rise for the rat king, ascendant to the throne in \the [get_area(src)].", source = src, action = NOTIFY_ORBIT, flashwindow = FALSE)
+
+/mob/living/simple_animal/hostile/regalrat/handle_automated_action()
+ if(prob(20))
+ riot.Trigger()
+ else if(prob(50))
+ coffer.Trigger()
+ return ..()
+
+/mob/living/simple_animal/hostile/regalrat/CanAttack(atom/the_target)
+ if(istype(the_target,/mob/living/simple_animal))
+ var/mob/living/A = the_target
+ if(istype(the_target, /mob/living/simple_animal/hostile/regalrat) && A.stat == CONSCIOUS)
+ return TRUE
+ if(istype(the_target, /mob/living/simple_animal/hostile/rat) && A.stat == CONSCIOUS)
+ var/mob/living/simple_animal/hostile/rat/R = the_target
+ if(R.faction_check_mob(src, TRUE))
+ return FALSE
+ else
+ return TRUE
+ return ..()
+
+/mob/living/simple_animal/hostile/regalrat/examine(mob/user)
+ . = ..()
+ if(istype(user,/mob/living/simple_animal/hostile/rat))
+ var/mob/living/simple_animal/hostile/rat/ratself = user
+ if(ratself.faction_check_mob(src, TRUE))
+ . += "
This is your king. Long live his majesty!"
+ else
+ . += "
This is a false king! Strike him down!"
+ else if(istype(user,/mob/living/simple_animal/hostile/regalrat))
+ . += "
Who is this foolish false king? This will not stand!"
+
+/**
+ *This action creates trash, money, dirt, and cheese.
+ */
+
+/datum/action/cooldown/coffer
+ name = "Fill Coffers"
+ desc = "Your newly granted regality and poise let you scavenge for lost junk, but more importantly, cheese."
+ icon_icon = 'icons/mob/actions/actions_animal.dmi'
+ background_icon_state = "bg_clock"
+ button_icon_state = "coffer"
+ cooldown_time = 50
+
+/datum/action/cooldown/coffer/Trigger()
+ . = ..()
+ if(!.)
+ return
+ var/turf/T = get_turf(owner)
+ var/loot = rand(1,100)
+ switch(loot)
+ if(1 to 5)
+ to_chat(owner, "
Score! You find some cheese!")
+ new /obj/item/reagent_containers/food/snacks/cheesewedge(T)
+ if(6 to 10)
+ var/pickedcoin = pick(GLOB.ratking_coins)
+ to_chat(owner, "
You find some leftover coins. More for the royal treasury!")
+ for(var/i = 1 to rand(1,3))
+ new pickedcoin(T)
+ if(11)
+ to_chat(owner, "
You find a... Hunh. This coin doesn't look right.")
+ var/rarecoin = rand(1,2)
+ if (rarecoin == 1)
+ new /obj/item/coin/twoheaded(T)
+ else
+ new /obj/item/coin/antagtoken(T)
+ if(12 to 40)
+ var/pickedtrash = pick(GLOB.ratking_trash)
+ to_chat(owner, "
You just find more garbage and dirt. Lovely, but beneath you now.")
+ new /obj/effect/decal/cleanable/dirt(T)
+ new pickedtrash(T)
+ if(41 to 100)
+ to_chat(owner, "
Drat. Nothing.")
+ new /obj/effect/decal/cleanable/dirt(T)
+ StartCooldown()
+
+/**
+ *This action checks all nearby mice, and converts them into hostile rats. If no mice are nearby, creates a new one.
+ */
+
+/datum/action/cooldown/riot
+ name = "Raise Army"
+ desc = "Raise an army out of the hordes of mice and pests crawling around the maintenance shafts."
+ icon_icon = 'icons/mob/actions/actions_animal.dmi'
+ button_icon_state = "riot"
+ background_icon_state = "bg_clock"
+ cooldown_time = 80
+ ///Checks to see if there are any nearby mice. Does not count Rats.
+
+/datum/action/cooldown/riot/Trigger()
+ . = ..()
+ if(!.)
+ return
+ var/cap = CONFIG_GET(number/ratcap)
+ var/something_from_nothing = FALSE
+ for(var/mob/living/simple_animal/mouse/M in oview(owner, 5))
+ var/mob/living/simple_animal/hostile/rat/new_rat = new(get_turf(M))
+ something_from_nothing = TRUE
+ if(M.mind && M.stat == CONSCIOUS)
+ M.mind.transfer_to(new_rat)
+ if(istype(owner,/mob/living/simple_animal/hostile/regalrat))
+ var/mob/living/simple_animal/hostile/regalrat/giantrat = owner
+ new_rat.faction = giantrat.faction
+ qdel(M)
+ if(!something_from_nothing)
+ if(LAZYLEN(SSmobs.cheeserats) >= cap)
+ to_chat(owner,"
There's too many mice on this station to beckon a new one! Find them first!")
+ return
+ new /mob/living/simple_animal/mouse(owner.loc)
+ owner.visible_message("
[owner] commands a mouse to its side!")
+ else
+ owner.visible_message("
[owner] commands its army to action, mutating them into rats!")
+ StartCooldown()
+
+/mob/living/simple_animal/hostile/rat
+ name = "rat"
+ desc = "It's a nasty, ugly, evil, disease-ridden rodent with anger issues."
+ icon_state = "mouse_gray"
+ icon_living = "mouse_gray"
+ icon_dead = "mouse_gray_dead"
+ speak = list("Skree!","SKREEE!","Squeak?")
+ speak_emote = list("squeaks")
+ emote_hear = list("Hisses.")
+ emote_see = list("runs in a circle.", "stands on its hind legs.")
+ melee_damage_lower = 3
+ melee_damage_upper = 5
+ obj_damage = 5
+ speak_chance = 1
+ turns_per_move = 5
+ see_in_dark = 6
+ maxHealth = 15
+ health = 15
+ butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
+ density = FALSE
+ ventcrawler = VENTCRAWLER_ALWAYS
+ pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+ mob_size = MOB_SIZE_TINY
+ mob_biotypes = MOB_ORGANIC|MOB_BEAST
+ faction = list("rat")
+
+/mob/living/simple_animal/hostile/rat/Initialize()
+ . = ..()
+ SSmobs.cheeserats += src
+
+/mob/living/simple_animal/hostile/rat/Destroy()
+ SSmobs.cheeserats -= src
+ return ..()
+
+/mob/living/simple_animal/hostile/rat/examine(mob/user)
+ . = ..()
+ if(istype(user,/mob/living/simple_animal/hostile/rat))
+ var/mob/living/simple_animal/hostile/rat/ratself = user
+ if(ratself.faction_check_mob(src, TRUE))
+ . += "
You both serve the same king."
+ else
+ . += "
This fool serves a different king!"
+ else if(istype(user,/mob/living/simple_animal/hostile/regalrat))
+ var/mob/living/simple_animal/hostile/regalrat/ratking = user
+ if(ratking.faction_check_mob(src, TRUE))
+ . += "
This rat serves under you."
+ else
+ . += "
This peasant serves a different king! Strike him down!"
+
+/mob/living/simple_animal/hostile/rat/CanAttack(atom/the_target)
+ if(istype(the_target,/mob/living/simple_animal))
+ var/mob/living/A = the_target
+ if(istype(the_target, /mob/living/simple_animal/hostile/regalrat) && A.stat == CONSCIOUS)
+ var/mob/living/simple_animal/hostile/regalrat/ratking = the_target
+ if(ratking.faction_check_mob(src, TRUE))
+ return FALSE
+ else
+ return TRUE
+ if(istype(the_target, /mob/living/simple_animal/hostile/rat) && A.stat == CONSCIOUS)
+ var/mob/living/simple_animal/hostile/rat/R = the_target
+ if(R.faction_check_mob(src, TRUE))
+ return FALSE
+ else
+ return TRUE
+ return ..()
+
+/mob/living/simple_animal/hostile/rat/handle_automated_action()
+ . = ..()
+ if(prob(40))
+ var/turf/open/floor/F = get_turf(src)
+ if(istype(F) && !F.intact)
+ var/obj/structure/cable/C = locate() in F
+ if(C && prob(15))
+ if(C.avail())
+ visible_message("
[src] chews through the [C]. It's toast!")
+ playsound(src, 'sound/effects/sparks2.ogg', 100, TRUE)
+ C.deconstruct()
+ death()
+ else if(C && C.avail())
+ visible_message("
[src] chews through the [C]. It looks unharmed!")
+ playsound(src, 'sound/effects/sparks2.ogg', 100, TRUE)
+ C.deconstruct()
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/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm
index 76463c6867..e27eaa53ae 100644
--- a/code/modules/modular_computers/hardware/hard_drive.dm
+++ b/code/modules/modular_computers/hardware/hard_drive.dm
@@ -157,7 +157,7 @@
max_capacity = 64
icon_state = "ssd_mini"
w_class = WEIGHT_CLASS_TINY
- custom_price = 150
+ custom_price = PRICE_ABOVE_NORMAL
/obj/item/computer_hardware/hard_drive/small/syndicate // Syndicate variant - very slight better
desc = "An efficient SSD for portable devices developed by a rival organisation."
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/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm
index 705888a427..3e76fc874a 100644
--- a/code/modules/photography/camera/camera.dm
+++ b/code/modules/photography/camera/camera.dm
@@ -15,7 +15,7 @@
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_NECK
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 150)
- custom_price = 120
+ custom_price = PRICE_NORMAL
var/flash_enabled = TRUE
var/state_on = "camera"
var/state_off = "camera_off"
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 60532028da..c7b54a0882 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1575,5 +1575,5 @@
/obj/item/electronics/apc
name = "power control module"
icon_state = "power_mod"
- custom_price = 50
+ custom_price = PRICE_CHEAP
desc = "Heavy-duty switching circuits for power control."
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 0d674a2f77..eb456a3f44 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -488,7 +488,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/item/stack/cable_coil
name = "cable coil"
- custom_price = 75
+ custom_price = PRICE_CHEAP_AS_FREE
gender = NEUTER //That's a cable coil sounds better than that's some cable coils
icon = 'icons/obj/power.dmi'
icon_state = "coil"
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/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
index 597c7203b4..4e638ce1fc 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -40,6 +40,18 @@
desc = "Designed to quickly reload revolvers. Iceblox bullets contain a cryogenic payload."
ammo_type = /obj/item/ammo_casing/c38/iceblox
+/obj/item/ammo_box/c32mm
+ name = "ammo box (.32 acp)"
+ desc = "Lethal .32 acp bullets, there's forty in the box."
+ ammo_type = /obj/item/ammo_casing/c32acp
+ max_ammo = 40
+
+/obj/item/ammo_box/r32mm
+ name = "ammo box (rubber .32 acp)"
+ desc = "Non-lethal .32 acp bullets, there's forty in the box."
+ ammo_type = /obj/item/ammo_casing/r32acp
+ max_ammo = 40
+
/obj/item/ammo_box/c9mm
name = "ammo box (9mm)"
icon_state = "9mmbox"
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 a5938c2758..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)
@@ -162,7 +164,15 @@
/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)
var/turf/target_loca = get_turf(target)
@@ -249,27 +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)
- return
-
/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/turf/T = get_turf(A)
- if(trajectory && check_ricochet(A) && check_ricochet_flag(A) && ricochets < ricochets_max)
- var/datum/point/pcache = trajectory.copy_to()
- ricochets++
- if(A.handle_ricochet(src))
- on_ricochet(A)
- ignore_source_check = TRUE
- decayedRange = max(0, decayedRange - reflect_range_decrease)
- 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)
@@ -344,16 +381,6 @@
return T
//Returns null if nothing at all was found.
-/obj/item/projectile/proc/check_ricochet()
- if(prob(ricochet_chance))
- return TRUE
- return FALSE
-
-/obj/item/projectile/proc/check_ricochet_flag(atom/A)
- if(A.flags_1 & CHECK_RICOCHET_1)
- 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))
@@ -431,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)
@@ -457,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)
@@ -505,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)
@@ -515,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
@@ -550,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/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index d5cd4ab8d0..4ad9cc06ff 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -32,7 +32,7 @@
for (var/x in 1 to PILL_STYLE_COUNT)
var/list/SL = list()
SL["id"] = x
- SL["htmltag"] = assets.icon_tag("pill[x]")
+ SL["htmltag"] = assets.icon_class_name("pill[x]")
pillStyles += list(SL)
. = ..()
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/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index cc1cd21bac..ad8d722b61 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -8,7 +8,6 @@
possible_transfer_amounts = list(5,10,15,25,30)
volume = 30
-
/obj/item/reagent_containers/glass/bottle/Initialize()
. = ..()
if(!icon_state)
@@ -40,7 +39,6 @@
. += filling
-
/obj/item/reagent_containers/glass/bottle/epinephrine
name = "epinephrine bottle"
desc = "A small bottle. Contains epinephrine - used to stabilize patients."
@@ -228,6 +226,13 @@
desc = "A small bottle of atropine."
list_reagents = list(/datum/reagent/medicine/atropine = 30)
+/obj/item/reagent_containers/glass/bottle/zeolites
+ name = "Zeolites bottle"
+ desc = "A small bottle of lab made Zeolite, which removes radiation from people quickly as well as contamination on items."
+ list_reagents = list(/datum/reagent/fermi/zeolites = 30)
+
+// Viro bottles
+
/obj/item/reagent_containers/glass/bottle/romerol
name = "romerol bottle"
desc = "A small bottle of Romerol. The REAL zombie powder."
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index b4c570dfc6..3ed946d0c5 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -7,7 +7,7 @@
possible_transfer_amounts = list(1, 2, 3, 4, 5)
volume = 5
reagent_flags = TRANSPARENT
- custom_price = 75
+ custom_price = PRICE_CHEAP_AS_FREE
/obj/item/reagent_containers/dropper/afterattack(obj/target, mob/user , proximity)
. = ..()
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 549f4eb48c..328b30d092 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -361,7 +361,7 @@
icon = 'icons/obj/drinks.dmi'
icon_state = "smallbottle"
item_state = "bottle"
- custom_price = 30
+ custom_price = PRICE_CHEAP_AS_FREE
list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard
custom_materials = list(/datum/material/glass=0)
volume = 50
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 99a93e58dc..799a6db9f5 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -96,8 +96,7 @@
reagent_flags = DRAWABLE
flags_1 = null
list_reagents = list(/datum/reagent/medicine/epinephrine = 10, /datum/reagent/preservahyde = 3)
- custom_price = 150
- custom_premium_price = 300
+ custom_premium_price = PRICE_ALMOST_EXPENSIVE
/obj/item/reagent_containers/hypospray/medipen/suicide_act(mob/living/carbon/user)
user.visible_message("
[user] begins to choke on \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 4782a80c62..4ab1470667 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -15,7 +15,7 @@
var/show_filling = TRUE
custom_materials = list(/datum/material/iron=10, /datum/material/glass=20)
reagent_flags = TRANSPARENT
- custom_price = 100
+ custom_price = PRICE_CHEAP_AS_FREE
/obj/item/reagent_containers/syringe/Initialize()
. = ..()
diff --git a/code/modules/research/bepis.dm b/code/modules/research/bepis.dm
index 6b3493b797..87aec72646 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/uplink/uplink_items/uplink_devices.dm b/code/modules/uplink/uplink_items/uplink_devices.dm
index 2d20fd0b7b..df6373b8de 100644
--- a/code/modules/uplink/uplink_items/uplink_devices.dm
+++ b/code/modules/uplink/uplink_items/uplink_devices.dm
@@ -100,6 +100,12 @@
cost = 1
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+/datum/uplink_item/device_tools/ammo_pouch
+ name = "Ammo Pouch"
+ desc = "A small yet large enough pouch that can fit in your pocket, and has room for three magazines."
+ item = /obj/item/storage/bag/ammo
+ cost = 1
+
/datum/uplink_item/device_tools/fakenucleardisk
name = "Decoy Nuclear Authentication Disk"
desc = "It's just a normal disk. Visually it's identical to the real deal, but it won't hold up under closer scrutiny by the Captain. \
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 25dbee66bc..92e40bc3a8 100644
--- a/code/modules/vending/assist.dm
+++ b/code/modules/vending/assist.dm
@@ -14,14 +14,15 @@
/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
resistance_flags = FIRE_PROOF
- default_price = 50
- extra_price = 100
+ default_price = PRICE_REALLY_CHEAP
+ extra_price = PRICE_ALMOST_CHEAP
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/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 216b95145d..9dfb4c76a0 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -139,8 +139,8 @@
/obj/item/clothing/under/costume/drfreeze = 1)
refill_canister = /obj/item/vending_refill/autodrobe
- default_price = 180
- extra_price = 360
+ default_price = PRICE_ALMOST_CHEAP
+ extra_price = PRICE_ALMOST_EXPENSIVE
payment_department = ACCOUNT_SRV
/obj/machinery/vending/autodrobe/Initialize()
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index e24813c2e9..97efbecb77 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -40,8 +40,8 @@
product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?"
product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!"
refill_canister = /obj/item/vending_refill/boozeomat
- default_price = 120
- extra_price = 100
+ default_price = PRICE_ALMOST_CHEAP
+ extra_price = PRICE_EXPENSIVE
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
diff --git a/code/modules/vending/cartridge.dm b/code/modules/vending/cartridge.dm
index 79380ca1f3..beaf6bb873 100644
--- a/code/modules/vending/cartridge.dm
+++ b/code/modules/vending/cartridge.dm
@@ -10,16 +10,19 @@
/obj/item/cartridge/security = 10,
/obj/item/cartridge/janitor = 10,
/obj/item/cartridge/signal/toxins = 10,
- /obj/item/pda/heads = 10,
- /obj/item/cartridge/captain = 3,
- /obj/item/cartridge/quartermaster = 10)
+ /obj/item/pda/heads = 10)
+ premium = list(/obj/item/cartridge/captain = 2,
+ /obj/item/cartridge/quartermaster = 2)
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/cart
resistance_flags = FIRE_PROOF
- default_price = 250
- extra_price = 500
+ default_price = PRICE_ALMOST_EXPENSIVE
+ extra_price = PRICE_ALMOST_ONE_GRAND
payment_department = ACCOUNT_SRV
- cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
+
+/obj/machinery/vending/cart/Initialize()
+ . = ..()
+ cost_multiplier_per_dept = list("[ACCESS_CHANGE_IDS]" = 0)
/obj/item/vending_refill/cart
icon_state = "refill_pda"
diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm
index 6f535b2c6d..0f26abde1d 100644
--- a/code/modules/vending/cigarette.dm
+++ b/code/modules/vending/cigarette.dm
@@ -20,8 +20,8 @@
/obj/item/storage/fancy/cigarettes/cigars/havana = 1,
/obj/item/storage/fancy/cigarettes/cigars/cohiba = 1)
refill_canister = /obj/item/vending_refill/cigarette
- default_price = 75
- extra_price = 250
+ default_price = PRICE_ALMOST_CHEAP
+ extra_price = PRICE_ABOVE_NORMAL
payment_department = ACCOUNT_SRV
/obj/machinery/vending/cigarette/syndicate
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 2155d0fe8b..963fff9368 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -173,8 +173,8 @@
/obj/item/clothing/suit/jacket/letterman_nanotrasen = 5,
/obj/item/clothing/suit/hooded/wintercoat/polychromic = 5)
refill_canister = /obj/item/vending_refill/clothing
- default_price = 60
- extra_price = 120
+ default_price = PRICE_CHEAP
+ extra_price = PRICE_BELOW_NORMAL
payment_department = NO_FREEBIES
/obj/machinery/vending/clothing/canLoadItem(obj/item/I,mob/user)
diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm
index f4a8b2503e..ab64756868 100644
--- a/code/modules/vending/coffee.dm
+++ b/code/modules/vending/coffee.dm
@@ -8,14 +8,13 @@
/obj/item/reagent_containers/food/drinks/mug/tea = 25,
/obj/item/reagent_containers/food/drinks/mug/coco = 25)
contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12)
- premium = list(/obj/item/reagent_containers/food/snacks/chocolatebar = 3,
- /obj/item/reagent_containers/food/condiment/milk = 2,
+ premium = list(/obj/item/reagent_containers/food/condiment/milk = 2,
/obj/item/reagent_containers/food/drinks/bottle/cream = 2,
/obj/item/reagent_containers/food/condiment/sugar = 1)
refill_canister = /obj/item/vending_refill/coffee
- default_price = 45
- extra_price = 150
+ default_price = PRICE_REALLY_CHEAP
+ extra_price = PRICE_PRETTY_CHEAP
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/coffee
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
index 5bbd0c3d02..b667f4c7c9 100644
--- a/code/modules/vending/cola.dm
+++ b/code/modules/vending/cola.dm
@@ -21,8 +21,8 @@
/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1,
/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy = 1)
refill_canister = /obj/item/vending_refill/cola
- default_price = 45
- extra_price = 200
+ default_price = PRICE_CHEAP_AS_FREE
+ extra_price = PRICE_ABOVE_NORMAL
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/cola
diff --git a/code/modules/vending/dinnerware.dm b/code/modules/vending/dinnerware.dm
index 521e76b5e2..b78af9c46b 100644
--- a/code/modules/vending/dinnerware.dm
+++ b/code/modules/vending/dinnerware.dm
@@ -27,8 +27,8 @@
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/dinnerware
resistance_flags = FIRE_PROOF
- default_price = 50
- extra_price = 250
+ default_price = PRICE_REALLY_CHEAP
+ extra_price = PRICE_ALMOST_EXPENSIVE
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm
index 36bacd4259..ef4edd6b67 100644
--- a/code/modules/vending/engineering.dm
+++ b/code/modules/vending/engineering.dm
@@ -28,7 +28,7 @@
/obj/item/stock_parts/manipulator = 5)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
- default_price = 450
- extra_price = 500
+ default_price = PRICE_NORMAL
+ extra_price = PRICE_NORMAL
payment_department = ACCOUNT_ENG
cost_multiplier_per_dept = list(ACCOUNT_ENG = 0)
diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm
index ca45483ff5..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,
@@ -29,10 +30,10 @@
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/engivend
resistance_flags = FIRE_PROOF
- default_price = 450
- extra_price = 500
+ default_price = PRICE_ALMOST_EXPENSIVE
+ extra_price = PRICE_ABOVE_EXPENSIVE
payment_department = ACCOUNT_ENG
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/games.dm b/code/modules/vending/games.dm
index 641e52dd13..7bed27b0bd 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -12,8 +12,8 @@
premium = list(/obj/item/melee/skateboard/pro = 3,
/obj/item/melee/skateboard/hoverboard = 1)
refill_canister = /obj/item/vending_refill/games
- default_price = 50
- extra_price = 250
+ default_price = PRICE_CHEAP
+ extra_price = PRICE_ALMOST_EXPENSIVE
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
diff --git a/code/modules/vending/kinkmate.dm b/code/modules/vending/kinkmate.dm
index 37f4e380ce..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,
@@ -40,8 +44,8 @@
/obj/item/clothing/under/pants/chaps = 5
)
refill_canister = /obj/item/vending_refill/kink
- default_price = 80
- extra_price = 250
+ default_price = PRICE_CHEAP
+ extra_price = PRICE_BELOW_NORMAL
payment_department = NO_FREEBIES
/obj/item/vending_refill/kink
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index c75d313c52..81afab3a70 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -28,6 +28,6 @@
/obj/item/reagent_containers/food/snacks/burger/superbite = 3) //U S A
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
- default_price = 150
- extra_price = 500
+ default_price = PRICE_ABOVE_NORMAL
+ extra_price = PRICE_ABOVE_EXPENSIVE
payment_department = ACCOUNT_SEC
diff --git a/code/modules/vending/liberation_toy.dm b/code/modules/vending/liberation_toy.dm
index 8ed4cd85ae..1ce0b6cfaf 100644
--- a/code/modules/vending/liberation_toy.dm
+++ b/code/modules/vending/liberation_toy.dm
@@ -25,8 +25,8 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/donksoft
- default_price = 150
- extra_price = 300
+ default_price = PRICE_ABOVE_NORMAL
+ extra_price = PRICE_EXPENSIVE
payment_department = NO_FREEBIES
/obj/machinery/vending/toyliberationstation/Initialize()
diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm
index 525b9f1af2..9dcd77e4ab 100644
--- a/code/modules/vending/magivend.dm
+++ b/code/modules/vending/magivend.dm
@@ -16,6 +16,6 @@
contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50, "magic" = 100)
resistance_flags = FIRE_PROOF
- default_price = 250
- extra_price = 500
+ default_price = PRICE_EXPENSIVE
+ extra_price = PRICE_ABOVE_EXPENSIVE
payment_department = ACCOUNT_SRV
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 797fdabce7..fbd9a10bf2 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -46,8 +46,8 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/medical
- default_price = 200
- extra_price = 250
+ default_price = PRICE_ALMOST_CHEAP
+ extra_price = PRICE_ABOVE_NORMAL
payment_department = ACCOUNT_MED
cost_multiplier_per_dept = list(ACCOUNT_MED = 0)
diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm
index b51705c7e1..694d2b0c34 100644
--- a/code/modules/vending/medical_wall.dm
+++ b/code/modules/vending/medical_wall.dm
@@ -18,8 +18,8 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/wallmed
- default_price = 0
- extra_price = 100
+ default_price = PRICE_FREE
+ extra_price = PRICE_NORMAL
payment_department = ACCOUNT_MED
cost_multiplier_per_dept = list(ACCOUNT_MED = 0)
diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm
index df1e5eaba8..2eb68aaf4a 100644
--- a/code/modules/vending/megaseed.dm
+++ b/code/modules/vending/megaseed.dm
@@ -58,8 +58,8 @@
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/hydroseeds
resistance_flags = FIRE_PROOF
- default_price = 100
- extra_price = 350
+ default_price = PRICE_ALMOST_CHEAP
+ extra_price = PRICE_NORMAL
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm
index 95ba4e23e8..40ca06b78b 100644
--- a/code/modules/vending/nutrimax.dm
+++ b/code/modules/vending/nutrimax.dm
@@ -19,8 +19,8 @@
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/hydronutrients
resistance_flags = FIRE_PROOF
- default_price = 100
- extra_price = 250
+ default_price = PRICE_REALLY_CHEAP
+ extra_price = PRICE_CHEAP
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
diff --git a/code/modules/vending/plasmaresearch.dm b/code/modules/vending/plasmaresearch.dm
index 410154fa20..bb16570ab3 100644
--- a/code/modules/vending/plasmaresearch.dm
+++ b/code/modules/vending/plasmaresearch.dm
@@ -11,7 +11,7 @@
/obj/item/assembly/prox_sensor = 6,
/obj/item/assembly/igniter = 6)
contraband = list(/obj/item/assembly/health = 3)
- default_price = 400
- extra_price = 600
+ default_price = PRICE_EXPENSIVE
+ extra_price = PRICE_REALLY_EXPENSIVE
payment_department = ACCOUNT_SCI
cost_multiplier_per_dept = list(ACCOUNT_SCI = 0)
diff --git a/code/modules/vending/robotics.dm b/code/modules/vending/robotics.dm
index 3ad7134498..88f65506a6 100644
--- a/code/modules/vending/robotics.dm
+++ b/code/modules/vending/robotics.dm
@@ -20,6 +20,6 @@
/obj/item/crowbar = 5)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
- default_price = 600
+ default_price = PRICE_EXPENSIVE
payment_department = ACCOUNT_SCI
cost_multiplier_per_dept = list(ACCOUNT_SCI = 0)
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index 284e957864..43f3a96d3d 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -15,18 +15,20 @@
/obj/item/secbat = 5)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,
/obj/item/storage/fancy/donut_box = 2,
- /obj/item/ssword_kit = 1)
+ /obj/item/ssword_kit = 1,
+ /obj/item/storage/bag/ammo = 1)
premium = list(/obj/item/coin/antagtoken = 1,
/obj/item/clothing/head/helmet/blueshirt = 1,
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
/obj/item/clothing/under/rank/security/officer/blueshirt = 1,
/obj/item/clothing/gloves/tackler = 5,
- /obj/item/ssword_kit = 1)
+ /obj/item/ssword_kit = 1,
+ /obj/item/storage/bag/ammo = 2)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/security
- default_price = 650
- extra_price = 700
+ default_price = PRICE_ALMOST_EXPENSIVE
+ extra_price = PRICE_REALLY_EXPENSIVE
payment_department = ACCOUNT_SEC
cost_multiplier_per_dept = list(ACCOUNT_SEC = 0)
diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm
index e051d6135b..7aef2b627c 100644
--- a/code/modules/vending/snack.dm
+++ b/code/modules/vending/snack.dm
@@ -27,8 +27,8 @@
refill_canister = /obj/item/vending_refill/snack
canload_access_list = list(ACCESS_KITCHEN)
- default_price = 60
- extra_price = 160
+ default_price = PRICE_REALLY_CHEAP
+ extra_price = PRICE_ALMOST_CHEAP
payment_department = ACCOUNT_SRV
cost_multiplier_per_dept = list(ACCOUNT_SRV = 0)
input_display_header = "Chef's Food Selection"
diff --git a/code/modules/vending/sovietsoda.dm b/code/modules/vending/sovietsoda.dm
index d820794660..88aba484e1 100644
--- a/code/modules/vending/sovietsoda.dm
+++ b/code/modules/vending/sovietsoda.dm
@@ -7,6 +7,6 @@
contraband = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
- default_price = 1
- extra_price = 1
+ default_price = PRICE_FREE
+ extra_price = PRICE_FREE
payment_department = NO_FREEBIES
diff --git a/code/modules/vending/sovietvend.dm b/code/modules/vending/sovietvend.dm
index daf64d5f3e..71547e6198 100644
--- a/code/modules/vending/sovietvend.dm
+++ b/code/modules/vending/sovietvend.dm
@@ -23,8 +23,8 @@
premium = list()
refill_canister = /obj/item/vending_refill/soviet
- default_price = 1
- extra_price = 1
+ default_price = PRICE_FREE
+ extra_price = PRICE_FREE
payment_department = NO_FREEBIES
/obj/item/vending_refill/soviet
diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm
index 55e6b02e8e..2dcc1e99f7 100644
--- a/code/modules/vending/sustenance.dm
+++ b/code/modules/vending/sustenance.dm
@@ -5,7 +5,7 @@
product_ads = "Sufficiently healthy.;Efficiently produced tofu!;Mmm! So good!;Have a meal.;You need food to live!;Have some more candy corn!;Try our new ice cups!"
icon_state = "sustenance"
products = list(/obj/item/reagent_containers/food/snacks/tofu = 24,
- /obj/item/reagent_containers/food/drinks/ice = 12,
+ /obj/item/reagent_containers/food/drinks/ice/sustanance = 12,
/obj/item/reagent_containers/food/snacks/candy_corn = 6)
contraband = list(/obj/item/kitchen/knife = 6,
/obj/item/reagent_containers/food/drinks/coffee = 12,
@@ -14,8 +14,8 @@
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/sustenance
resistance_flags = FIRE_PROOF
- default_price = 0
- extra_price = 0
+ default_price = PRICE_FREE
+ extra_price = PRICE_FREE
payment_department = NO_FREEBIES
/obj/item/vending_refill/sustenance
diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm
index a00dd17a9c..d628c888a5 100644
--- a/code/modules/vending/toys.dm
+++ b/code/modules/vending/toys.dm
@@ -25,8 +25,8 @@
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/donksoft
- default_price = 150
- extra_price = 300
+ default_price = PRICE_ABOVE_NORMAL
+ extra_price = PRICE_EXPENSIVE
payment_department = ACCOUNT_SRV
/obj/item/vending_refill/donksoft
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 41fa9a99f8..76ef5e6f23 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -2,8 +2,8 @@
icon_state = "refill_clothes"
/obj/machinery/vending/wardrobe
- default_price = 350
- extra_price = 400
+ default_price = PRICE_NORMAL
+ extra_price = PRICE_EXPENSIVE
payment_department = NO_FREEBIES
input_display_header = "Returned Clothing"
@@ -33,6 +33,8 @@
refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
payment_department = ACCOUNT_SEC
cost_multiplier_per_dept = list(ACCOUNT_SEC = 0)
+ default_price = PRICE_ABOVE_NORMAL
+ extra_price = PRICE_EXPENSIVE
/obj/item/vending_refill/wardrobe/sec_wardrobe
machine_name = "SecDrobe"
@@ -480,6 +482,8 @@
/obj/item/clothing/gloves/color/captain = 1)
refill_canister = /obj/item/vending_refill/wardrobe/cap_wardrobe
payment_department = ACCOUNT_CIV
+ default_price = PRICE_ALMOST_EXPENSIVE
+ extra_price = PRICE_ABOVE_EXPENSIVE
/obj/machinery/vending/wardrobe/cap_wardrobe/Initialize()
. = ..()
diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm
index 6b38ec0b9d..c936d9c32c 100644
--- a/code/modules/vending/youtool.dm
+++ b/code/modules/vending/youtool.dm
@@ -18,14 +18,15 @@
/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
- default_price = 50
- extra_price = 300
+ default_price = PRICE_REALLY_CHEAP
+ extra_price = PRICE_EXPENSIVE
payment_department = ACCOUNT_ENG
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/game_options.txt b/config/game_options.txt
index f65c1bfff5..405ec0405a 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -603,6 +603,9 @@ NIGHTSHIFT_TOGGLE_PUBLIC_REQUIRES_AUTH
## A cap on how many monkeys may be created via monkey cubes
MONKEYCAP 64
+## A cap on how many mice can be bred via cheese wedges
+RATCAP 64
+
## Enable the capitalist agenda on your server.
ECONOMY
diff --git a/config/plushies/defines.txt b/config/plushies/defines.txt
index e69de29bb2..7cd1d88f3e 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 2f03aa2815..ce00531001 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,123 @@
-->
+
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:
+
+ - Golems / simillar now inherit the neutered antag datum if the creator is neutered.
+
+
Ghommie updated:
+
+ - Fixing missing pill type buttons from the chem master UI.
+
+
Naksu updated:
+
+ - Lighting corner updates are ever so slightly faster.
+
+
Putnam for helping me code the contamination clearing on people updated:
+
+ - 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 updated:
+
+ - Tank Dispender has been moved into toxin storage from toxins
+
+
kevinz000 updated:
+
+ - traitor classes can now be poplocked. hijack/glorious death are now locked to 25/20 respectively.
+
+
timothyteakettle updated:
+
+ - adds a new fermichem, used for creating sentient plushies!
+ - Mice can now breed using cheese wedges
+ - Royal cheese can be crafted to convert a mouse into king rat
+
+
09 June 2020
Anonymous updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index abd5de1785..a25fb6595c 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -25863,3 +25863,99 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
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-12493.yml b/html/changelogs/AutoChangeLog-pr-12493.yml
deleted file mode 100644
index 61710ce9bb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12493.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Golems / simillar now inherit the neutered antag datum if the creator is neutered."
diff --git a/html/changelogs/AutoChangeLog-pr-12496.yml b/html/changelogs/AutoChangeLog-pr-12496.yml
deleted file mode 100644
index 7fc967d123..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12496.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Naksu"
-delete-after: True
-changes:
- - code_imp: "Lighting corner updates are ever so slightly faster."
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/actions/actions_animal.dmi b/icons/mob/actions/actions_animal.dmi
index aefa471dd2..78eb9f5fe5 100644
Binary files a/icons/mob/actions/actions_animal.dmi and b/icons/mob/actions/actions_animal.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 9affc07f88..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/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index c95e6e5cb7..c5b2b3fc42 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.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/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
index 82efabc4e2..56ad24c599 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -159,6 +159,35 @@
log_reagent("FERMICHEM: [M] ckey: [M.key]'s tongue has been made permanent")
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PLUSHMIUM
+///////////////////////////////////////////////////////////////////////////////////////////////////
+//A chemical you can spray on plushies to turn them into a 'shell'
+//Hugging the plushie turns yourself into the plushie!
+/datum/reagent/fermi/plushmium
+ name = "Plushmium"
+ description = "A strange chemical, seeming almost fluffy, if it were not for it being a liquid. Known to have a strange effect on plushies."
+ color = "#fbcbd7"
+ taste_description = "the soft feeling of a plushie"
+ pH = 5
+ value = 50
+ can_synth = TRUE
+
+/datum/reagent/fermi/plushmium/reaction_obj(obj/O, reac_volume)
+ if(istype(O, /obj/item/toy/plush) && reac_volume >= 5)
+ O.loc.visible_message("The plushie seems to be staring back at you.")
+ var/obj/item/toy/plushie_shell/new_shell = new /obj/item/toy/plushie_shell(O.loc)
+ new_shell.name = O.name
+ new_shell.icon = O.icon
+ new_shell.icon_state = O.icon_state
+ new_shell.stored_plush = O
+ O.forceMove(new_shell)
+
+//Extra interaction for which spraying it on an existing sentient plushie aheals them, so they can be revived!
+/datum/reagent/fermi/plushmium/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+ if(istype(M, /mob/living/simple_animal/pet/plushie) && reac_volume >= 1)
+ M.revive(full_heal = 1, admin_revive = 1)
+
///////////////////////////////////////////////////////////////////////////////////////////////
//Nanite removal
//Writen by Trilby!! Embellsished a little by me.
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
index 48c9ffb7e6..ca6bb302da 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
@@ -197,3 +197,25 @@
M.stat = DEAD
M.visible_message("The synthetic tissue degrades off [M]'s wounds as they collapse to the floor.")
//NEEDS ON_MOB_DEAD()
+
+/datum/reagent/fermi/zeolites
+ name = "Artificial Zeolites"
+ description = "Lab made Zeolite, used to clear radiation form people and items alike! Splashing just a small amounts(5u) onto any item can clear away large amouts of contamination."
+ pH = 8
+ color = "#FFDADA"
+ metabolization_rate = 8 * REAGENTS_METABOLISM //Lastes not long in body but heals a lot!
+ value = REAGENT_VALUE_COMMON
+
+/datum/reagent/fermi/zeolites/on_mob_life(mob/living/carbon/M)
+ var/datum/component/radioactive/contamination = M.GetComponent(/datum/component/radioactive)
+ if(M.radiation > 0)
+ M.radiation -= min(M.radiation, 60)
+ if(contamination.strength > 0)
+ contamination.strength -= min(contamination.strength, 100)
+ ..()
+
+/datum/reagent/fermi/zeolites/reaction_obj(obj/O, reac_volume)
+ var/datum/component/radioactive/contamination = O.GetComponent(/datum/component/radioactive)
+ if(contamination && reac_volume >= 5)
+ qdel(contamination)
+ return
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index a8998a51ac..b2c80e4a16 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -480,6 +480,33 @@
RateUpLim = 15
FermiChem = TRUE
+/datum/chemical_reaction/fermi/plushmium // done
+ name = "Plushification serum"
+ id = /datum/reagent/fermi/plushmium
+ results = list(/datum/reagent/fermi/plushmium = 5)
+ required_reagents = list(/datum/reagent/medicine/strange_reagent = 5, /datum/reagent/drug/happiness = 3, /datum/reagent/blood = 10, /datum/reagent/consumable/laughter = 5, /datum/reagent/toxin/bad_food = 6)
+ //mix_message = ""
+ //FermiChem vars:
+ OptimalTempMin = 400
+ OptimalTempMax = 666
+ ExplodeTemp = 800
+ OptimalpHMin = 2
+ OptimalpHMax = 5
+ ReactpHLim = 6
+ //CatalystFact = 0 //To do 1
+ CurveSharpT = 8
+ CurveSharppH = 0.5
+ ThermicConstant = -2
+ HIonRelease = -0.1
+ RateUpLim = 2
+ FermiChem = TRUE
+ FermiExplode = TRUE
+ PurityMin = 0.6
+
+/datum/chemical_reaction/fermi/plushmium/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH)
+ new /obj/item/toy/plush/random(get_turf(my_atom))
+ my_atom.visible_message("The reaction suddenly zaps, creating a plushie!")
+ my_atom.reagents.clear_reagents()
/datum/chemical_reaction/fermi/basic_buffer/FermiFinish(datum/reagents/holder, atom/my_atom) //might need this
var/datum/reagent/fermi/basic_buffer/Fb = locate(/datum/reagent/fermi/basic_buffer) in my_atom.reagents.reagent_list
@@ -561,3 +588,23 @@
HIonRelease = 0.1
RateUpLim = 2
FermiChem = TRUE
+
+/datum/chemical_reaction/fermi/zeolites
+ name = "Zeolites"
+ id = /datum/reagent/fermi/zeolites
+ results = list(/datum/reagent/fermi/zeolites = 5) //We make a lot!
+ required_reagents = list(/datum/reagent/medicine/potass_iodide = 1, /datum/reagent/aluminium = 1, /datum/reagent/silicon = 1, /datum/reagent/oxygen = 1)
+ //FermiChem vars:
+ OptimalTempMin = 300
+ OptimalTempMax = 900
+ ExplodeTemp = 1000 //check to see overflow doesn't happen!
+ OptimalpHMin = 4.0
+ OptimalpHMax = 6.0
+ ReactpHLim = 4
+ //CatalystFact = 0
+ CurveSharpT = 4
+ CurveSharppH = 0
+ ThermicConstant = 0
+ HIonRelease = 0.01
+ RateUpLim = 15
+ FermiChem = TRUE
\ No newline at end of file
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 114090dccc..5a19adc0f1 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"
@@ -2168,6 +2175,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"
@@ -2318,7 +2326,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"
@@ -2526,6 +2537,7 @@
#include "code\modules\mob\living\simple_animal\friendly\panda.dm"
#include "code\modules\mob\living\simple_animal\friendly\penguin.dm"
#include "code\modules\mob\living\simple_animal\friendly\pet.dm"
+#include "code\modules\mob\living\simple_animal\friendly\plushie.dm"
#include "code\modules\mob\living\simple_animal\friendly\sloth.dm"
#include "code\modules\mob\living\simple_animal\friendly\snake.dm"
#include "code\modules\mob\living\simple_animal\friendly\drone\_drone.dm"
@@ -2569,6 +2581,7 @@
#include "code\modules\mob\living\simple_animal\hostile\nanotrasen.dm"
#include "code\modules\mob\living\simple_animal\hostile\netherworld.dm"
#include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
+#include "code\modules\mob\living\simple_animal\hostile\regalrat.dm"
#include "code\modules\mob\living\simple_animal\hostile\russian.dm"
#include "code\modules\mob\living\simple_animal\hostile\sharks.dm"
#include "code\modules\mob\living\simple_animal\hostile\skeleton.dm"