Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More random slashes take two #4171

Closed
wants to merge 2 commits into from
Closed

More random slashes take two #4171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
234cbf4
Initial
morrowwolf Aug 12, 2023
2caecfc
And that
morrowwolf Aug 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/_onclick/xeno.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
return FALSE

target = target.handle_barriers(src, , (PASS_MOB_THRU_XENO|PASS_TYPE_CRAWLER)) // Checks if target will be attacked by the current alien OR if the blocker will be attacked
switch(target.attack_alien(src))
switch(target.attack_alien(src, directional_assist_attack = tile_attack))
if(XENO_ATTACK_ACTION)
xeno_attack_delay(src)
if(XENO_NONCOMBAT_ACTION)
Expand Down Expand Up @@ -96,7 +96,7 @@ Return FALSE if it didn't do anything and should count as a missed slash.

If using do_afters or sleeps, use invoke_async (or manually add the relevant action delayand return FALSE
so that it doesn't double up on the delays) so that it applies the delay immediately instead of when it finishes.**/
/atom/proc/attack_alien(mob/user as mob)
/atom/proc/attack_alien(mob/user as mob, dam_bonus, directional_assist_attack)
morrowwolf marked this conversation as resolved.
Show resolved Hide resolved
return

/mob/living/carbon/xenomorph/click(atom/target, list/mods)
Expand Down
4 changes: 2 additions & 2 deletions code/game/atoms_movable.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@
/atom/movable/clone/attack_hand(mob/user)
return src.mstr.attack_hand(user)

/atom/movable/clone/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus)
return src.mstr.attack_alien(M, dam_bonus)
/atom/movable/clone/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
return src.mstr.attack_alien(M, dam_bonus = dam_bonus)

/atom/movable/clone/attack_animal(mob/living/M as mob)
return src.mstr.attack_animal(M)
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/OpTable.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@
anes_tank = null

// Removing marines connected to anesthetic
/obj/structure/machinery/optable/attack_alien(mob/living/carbon/xenomorph/alien, mob/living/user)
/obj/structure/machinery/optable/attack_alien(mob/living/carbon/xenomorph/alien, dam_bonus, directional_assist_attack)
if(buckled_mob)
to_chat(alien, SPAN_XENONOTICE("You rip the tubes away from the host, releasing it!"))
playsound(alien, "alien_claw_flesh", 25, 1)
unbuckle(user)
unbuckle(buckled_mob)
else
. = ..()

Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/camera/presets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
unacidable = TRUE
network = list(CAMERA_NET_RESEARCH, CAMERA_NET_CONTAINMENT)

/obj/structure/machinery/camera/autoname/almayer/containment/attack_alien(mob/living/carbon/xenomorph/M)
/obj/structure/machinery/camera/autoname/almayer/containment/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
return

/obj/structure/machinery/camera/autoname/almayer/containment/hidden
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/door_control.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
else
to_chat(user, "Error, no route to host.")

/obj/structure/machinery/door_control/attack_alien(mob/user as mob)
/obj/structure/machinery/door_control/attack_alien(mob/user as mob, dam_bonus, directional_assist_attack)
return

/obj/structure/machinery/door_control/attackby(obj/item/W, mob/user as mob)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/doors/airlock_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@
return
..()

/obj/structure/machinery/door/airlock/dropship_hatch/attack_alien(mob/living/carbon/xenomorph/xeno)
/obj/structure/machinery/door/airlock/dropship_hatch/attack_alien(mob/living/carbon/xenomorph/xeno, dam_bonus, directional_assist_attack)

if(xeno.hive_pos != XENO_QUEEN)
return ..()
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/doors/multi_tile.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
return // in orbit
..()

/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/attack_alien(mob/living/carbon/xenomorph/xeno)
/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/attack_alien(mob/living/carbon/xenomorph/xeno, dam_bonus, directional_assist_attack)
if(xeno.hive_pos != XENO_QUEEN)
return ..()

Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/doors/poddoor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
density = FALSE
operating = 0

/obj/structure/machinery/door/poddoor/attack_alien(mob/living/carbon/xenomorph/X)
/obj/structure/machinery/door/poddoor/attack_alien(mob/living/carbon/xenomorph/X, dam_bonus, directional_assist_attack)
if((stat & NOPOWER) && density && !operating && !unacidable)
INVOKE_ASYNC(src, PROC_REF(pry_open), X)
return XENO_ATTACK_ACTION
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/doors/shutters.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
/obj/structure/machinery/door/poddoor/shutters/almayer/containment
unacidable = TRUE

/obj/structure/machinery/door/poddoor/shutters/almayer/containment/attack_alien(mob/living/carbon/xenomorph/M)
/obj/structure/machinery/door/poddoor/shutters/almayer/containment/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
if(isqueen(M) && density && !operating)
INVOKE_ASYNC(src, PROC_REF(pry_open), M)
return XENO_ATTACK_ACTION
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/medical_pod/medical_pod.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/obj/structure/machinery/medical_pod/attack_hand(mob/living/user)
eject()

/obj/structure/machinery/medical_pod/attack_alien(mob/living/carbon/xenomorph/M)
/obj/structure/machinery/medical_pod/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
eject()

/obj/structure/machinery/medical_pod/update_icon()
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/nuclearbomb.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ var/bomb_set = FALSE
timer_announcements_flags = 0
return

/obj/structure/machinery/nuclearbomb/attack_alien(mob/living/carbon/xenomorph/M)
/obj/structure/machinery/nuclearbomb/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, attack_hand), M)
return XENO_ATTACK_ACTION

Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/vending/cm_vending.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ GLOBAL_LIST_EMPTY(vending_products)

//------------INTERACTION PROCS---------------

/obj/structure/machinery/cm_vending/attack_alien(mob/living/carbon/xenomorph/M)
/obj/structure/machinery/cm_vending/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
if(stat & TIPPED_OVER || indestructible)
to_chat(M, SPAN_WARNING("There's no reason to bother with that old piece of trash."))
return XENO_NO_DELAY_ACTION
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/acid_hole.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
use_wall_hole(user)


/obj/effect/acid_hole/attack_alien(mob/living/carbon/xenomorph/user)
/obj/effect/acid_hole/attack_alien(mob/living/carbon/xenomorph/user, dam_bonus, directional_assist_attack)
if (!holed_wall)
qdel(src) //no wall?! then cease existence...
return
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
/obj/effect/decal/mecha_wreckage/bullet_act(obj/item/projectile/Proj)
return 1

/obj/effect/decal/mecha_wreckage/attack_alien(mob/living/carbon/xenomorph/M)
/obj/effect/decal/mecha_wreckage/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
playsound(src, 'sound/effects/metal_crash.ogg', 50, 1)
M.animation_attack_on(src)
M.visible_message(SPAN_DANGER("[M] slices [src] apart!"), SPAN_DANGER("You slice [src] apart!"))
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/effect_system/foam.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@

return FALSE

/obj/structure/foamed_metal/attack_alien(mob/living/carbon/xenomorph/X, dam_bonus)
/obj/structure/foamed_metal/attack_alien(mob/living/carbon/xenomorph/X, dam_bonus, directional_assist_attack)
var/damage = (rand(X.melee_damage_lower, X.melee_damage_upper) + dam_bonus)

//Frenzy bonus
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/flashlight.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
else
return ..()

/obj/item/device/flashlight/attack_alien(mob/living/carbon/xenomorph/M)
/obj/item/device/flashlight/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
. = ..()

if(on && can_be_broken)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/explosives/mine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
disarm()


/obj/item/explosive/mine/attack_alien(mob/living/carbon/xenomorph/M)
/obj/item/explosive/mine/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
if(triggered) //Mine is already set to go off
return XENO_NO_DELAY_ACTION

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/toys/toys.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@
playsound(target, pick('sound/voice/alien_queen_xmas.ogg', 'sound/voice/alien_queen_xmas_2.ogg'), 25, TRUE)
user.festivizer_hits_total++

/obj/item/toy/festivizer/attack_alien(mob/living/carbon/xenomorph/M)
/obj/item/toy/festivizer/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
attack_hand(M) //xenos can use them too.
return XENO_NONCOMBAT_ACTION

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/blocker.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
/obj/structure/blocker/fog/attack_hand(mob/M)
to_chat(M, SPAN_NOTICE("You peer through the fog, but it's impossible to tell what's on the other side..."))

/obj/structure/blocker/fog/attack_alien(M)
/obj/structure/blocker/fog/attack_alien(M, dam_bonus, directional_assist_attack)
attack_hand(M)
return XENO_NONCOMBAT_ACTION

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/crates_lockers/largecrate.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
else
return attack_hand(user)

/obj/structure/largecrate/attack_alien(mob/living/carbon/xenomorph/M)
/obj/structure/largecrate/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
M.animation_attack_on(src)
unpack()
M.visible_message(SPAN_DANGER("[M] smashes [src] apart!"), \
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/curtains.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
toggle()
..()

/obj/structure/curtain/attack_alien(mob/living/carbon/xenomorph/M)
/obj/structure/curtain/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
M.animation_attack_on(src)
M.visible_message(SPAN_DANGER("\The [M] slices [src] apart!"), \
SPAN_DANGER("You slice [src] apart!"), null, 5)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/janicart.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
if(signs)
overlays += "cart_sign[signs]"

/obj/structure/janitorialcart/attack_alien(mob/living/carbon/xenomorph/xeno_attacker)
/obj/structure/janitorialcart/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, dam_bonus, directional_assist_attack)
xeno_attacker.animation_attack_on(src)
playsound(src, 'sound/effects/metalhit.ogg', 25, 1)
xeno_attacker.visible_message(SPAN_DANGER("[xeno_attacker] slices \the [src] apart!"),
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/props.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@
visible_message(SPAN_NOTICE("[user] fuels [src] with [fuel]."))
remaining_fuel++

/obj/structure/prop/brazier/campfire/attack_alien(mob/living/carbon/xenomorph/xeno)
/obj/structure/prop/brazier/campfire/attack_alien(mob/living/carbon/xenomorph/xeno, dam_bonus, directional_assist_attack)
if(!extinguishable)
to_chat(xeno, SPAN_WARNING("You cannot extinguish [src]."))
return
Expand Down Expand Up @@ -1262,7 +1262,7 @@
helmet = null
overlays.Cut()

/obj/structure/prop/wooden_cross/attack_alien(mob/living/carbon/xenomorph/M)
/obj/structure/prop/wooden_cross/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
M.animation_attack_on(src)
update_health(rand(M.melee_damage_lower, M.melee_damage_upper))
playsound(src, 'sound/effects/woodhit.ogg', 25, 1)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/reagent_dispensers.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
healthcheck()
return TRUE

/obj/structure/reagent_dispensers/attack_alien(mob/living/carbon/xenomorph/user)
/obj/structure/reagent_dispensers/attack_alien(mob/living/carbon/xenomorph/user, dam_bonus, directional_assist_attack)
if(unslashable)
return XENO_NO_DELAY_ACTION
user.animation_attack_on(src)
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/stool_bed_chair_nest/chairs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
flags_can_pass_all_temp |= PASS_OVER
projectile_coverage = PROJECTILE_COVERAGE_MEDIUM

/obj/structure/bed/chair/attack_alien(mob/living/carbon/xenomorph/M)
/obj/structure/bed/chair/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
. = ..()
if(stacked_size)
stack_collapse()
Expand Down Expand Up @@ -440,7 +440,7 @@
return
..()

/obj/structure/bed/chair/dropship/passenger/attack_alien(mob/living/user)
/obj/structure/bed/chair/dropship/passenger/attack_alien(mob/living/user, dam_bonus, directional_assist_attack)
if(chair_state != DROPSHIP_CHAIR_BROKEN)
playsound(loc, 'sound/effects/metalhit.ogg', 25, 1)
user.animation_attack_on(src)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@
QDEL_IN(src, rand(225, 400))


/obj/structure/bed/nest/attack_alien(mob/living/carbon/xenomorph/M)
/obj/structure/bed/nest/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
if(islarva(M)) //Larvae can't do shit
return
if(M.a_intent == INTENT_HARM && !buckled_mob) //can't slash nest with an occupant.
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/window_frame.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
else
. = ..()

/obj/structure/window_frame/attack_alien(mob/living/carbon/xenomorph/user)
/obj/structure/window_frame/attack_alien(mob/living/carbon/xenomorph/user, dam_bonus, directional_assist_attack)
if(!reinforced && user.claw_type >= CLAW_TYPE_SHARP)
user.animation_attack_on(src)
playsound(src, 'sound/effects/metalhit.ogg', 25, 1)
Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/auto_turf.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
playsound(user, 'sound/weapons/Genhit.ogg', 25, 1)

//Digging up snow
/turf/open/auto_turf/snow/attack_alien(mob/living/carbon/xenomorph/M)
/turf/open/auto_turf/snow/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
if(M.a_intent == INTENT_HARM) //Missed slash.
return
if(M.a_intent == INTENT_HELP || !bleed_layer)
Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/light.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

return ..()

/turf/open/floor/light/attack_alien(mob/living/carbon/xenomorph/xeno_attacker) //Xeno breaking light, this makes them basically flashlight that needs a new bulb to go back on
/turf/open/floor/light/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, dam_bonus, directional_assist_attack) //Xeno breaking light, this makes them basically flashlight that needs a new bulb to go back on
if(!broken)
playsound(src, "windowshatter", 25, 1)
xeno_attacker.animation_attack_on(src)
Expand Down
8 changes: 4 additions & 4 deletions code/game/turfs/walls/wall_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
return
. = ..()

/turf/closed/wall/almayer/research/containment/wall/attack_alien(mob/living/carbon/xenomorph/user)
/turf/closed/wall/almayer/research/containment/wall/attack_alien(mob/living/carbon/xenomorph/user, dam_bonus, directional_assist_attack)
return

/turf/closed/wall/almayer/research/containment/wall/corner
Expand Down Expand Up @@ -331,7 +331,7 @@
damage_cap = HEALTH_WALL_REINFORCED//Strong, but only available to Hunters, can can still be blown up or melted by boilers.
baseturfs = /turf/open/floor/sandstone/runed

/turf/closed/wall/mineral/sandstone/runed/attack_alien(mob/living/carbon/xenomorph/user)
/turf/closed/wall/mineral/sandstone/runed/attack_alien(mob/living/carbon/xenomorph/user, dam_bonus, directional_assist_attack)
visible_message("[user] scrapes uselessly against [src] with their claws.")
return

Expand Down Expand Up @@ -966,7 +966,7 @@
else
update_icon()

/obj/structure/alien/movable_wall/attack_alien(mob/living/carbon/xenomorph/M)
/obj/structure/alien/movable_wall/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
if(islarva(M))
return FALSE

Expand Down Expand Up @@ -1176,7 +1176,7 @@
take_damage(tforce)


/turf/closed/wall/resin/attack_alien(mob/living/carbon/xenomorph/M)
/turf/closed/wall/resin/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
if(SEND_SIGNAL(src, COMSIG_WALL_RESIN_XENO_ATTACK, M) & COMPONENT_CANCEL_XENO_ATTACK)
return XENO_NO_DELAY_ACTION

Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/walls/walls.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
user_as_xenomorph.do_nesting_host(current_mob, src)
..()

/turf/closed/wall/attack_alien(mob/living/carbon/xenomorph/user)
/turf/closed/wall/attack_alien(mob/living/carbon/xenomorph/user, dam_bonus, directional_assist_attack)
if(acided_hole && user.mob_size >= MOB_SIZE_BIG)
acided_hole.expand_hole(user) //This proc applies the attack delay itself.
return XENO_NO_DELAY_ACTION
Expand Down
2 changes: 1 addition & 1 deletion code/modules/assembly/proximity.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
.["min_delay"] = PROXY_MINIMUM_DELAY
.["max_delay"] = PROXY_MAXIMUM_DELAY

/obj/item/device/assembly/prox_sensor/attack_alien(mob/living/carbon/xenomorph/xeno)
/obj/item/device/assembly/prox_sensor/attack_alien(mob/living/carbon/xenomorph/xeno, dam_bonus, directional_assist_attack)
. = ..()
if(scanning)
playsound(loc, "alien_claw_metal", 25, 1)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/gloves/marine_gloves.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
min_cold_protection_temperature = GLOVES_MIN_COLD_PROT
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROT
flags_armor_protection = BODY_FLAG_HANDS
armor_melee = CLOTHING_ARMOR_MEDIUM
armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_laser = CLOTHING_ARMOR_LOW
armor_energy = CLOTHING_ARMOR_NONE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/head/hardhat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
return TRUE
return FALSE

/obj/item/clothing/head/hardhat/attack_alien(mob/living/carbon/xenomorph/M)
/obj/item/clothing/head/hardhat/attack_alien(mob/living/carbon/xenomorph/M, dam_bonus, directional_assist_attack)
. = ..()

if(on && can_be_broken)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/shoes/marine_shoes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
desc = "Standard issue combat boots for combat scenarios or combat situations. All combat, all the time."
icon_state = "marine"
item_state = "marine"
armor_melee = CLOTHING_ARMOR_MEDIUM
armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_laser = CLOTHING_ARMOR_LOW
armor_energy = CLOTHING_ARMOR_NONE
armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
armor_bio = CLOTHING_ARMOR_MEDIUM
armor_rad = CLOTHING_ARMOR_NONE
armor_internaldamage = CLOTHING_ARMOR_MEDIUMLOW
armor_internaldamage = CLOTHING_ARMOR_LOW
flags_cold_protection = BODY_FLAG_FEET
flags_heat_protection = BODY_FLAG_FEET
min_cold_protection_temperature = SHOE_MIN_COLD_PROT
Expand Down
Loading
Loading