Skip to content

Commit

Permalink
Merge pull request #31 from Very-Soft/nerfspeed
Browse files Browse the repository at this point in the history
NERF SPEED
  • Loading branch information
Very-Soft authored Oct 29, 2023
2 parents bb09e1b + 0427c9e commit 6924b7b
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 16 deletions.
4 changes: 2 additions & 2 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
icon_state = "alien_speed"
blood_overlay_type = "armor"
item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor")
slowdown = -1
slowdown = -0.5
body_parts_covered = UPPER_TORSO|LOWER_TORSO
armor = list(melee = 50, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 0, rad = 40)
siemens_coefficient = 0.4
Expand Down Expand Up @@ -639,4 +639,4 @@
starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/bulletproof, /obj/item/clothing/accessory/armor/armguards/bulletproof, /obj/item/clothing/accessory/armor/legguards/bulletproof, /obj/item/clothing/accessory/storage/pouches)

/obj/item/clothing/suit/armor/pcarrier/riot/full
starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/riot, /obj/item/clothing/accessory/armor/armguards/riot, /obj/item/clothing/accessory/armor/legguards/riot, /obj/item/clothing/accessory/storage/pouches)
starting_accessories = list(/obj/item/clothing/accessory/armor/armorplate/riot, /obj/item/clothing/accessory/armor/armguards/riot, /obj/item/clothing/accessory/armor/legguards/riot, /obj/item/clothing/accessory/storage/pouches)
2 changes: 1 addition & 1 deletion code/modules/clothing/suits/hooded_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
icon_state = "robin"
hoodtype = /obj/item/clothing/head/hood/robin
armor = list(melee = 70, bullet = 40, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
slowdown = -1
slowdown = -0.5
siemens_coefficient = 3

// Costume Knight Gear Here
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/_modifiers/modifiers_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ the artifact triggers the rage.
stacks = MODIFIER_STACK_EXTEND

// The good stuff.
slowdown = -1 // Move a bit faster.
slowdown = -0.5 // Move a bit faster.
attack_speed_percent = 0.66 // Attack at 2/3 the normal delay.
outgoing_melee_damage_percent = 1.5 // 50% more damage from melee.
max_health_percent = 1.5 // More health as a buffer, however the holder might fall into crit after this expires if they're mortally wounded.
Expand Down Expand Up @@ -194,7 +194,7 @@ the artifact triggers the rage.
on_expired_text = "<span class='notice'>The energy high dies out.</span>"
stacks = MODIFIER_STACK_EXTEND

slowdown = -1
slowdown = -0.5
disable_duration_percent = 0.8

// Speedy, but not berserked.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@

material_name = MAT_METALHYDROGEN

slowdown = -1
slowdown = -0.5

/datum/modifier/protean/uranium
name = "Protean Effect - Uranium"
Expand Down Expand Up @@ -347,4 +347,4 @@
. += registring

#undef DAM_SCALE_FACTOR
#undef METAL_PER_TICK
#undef METAL_PER_TICK
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

fire_icon_state = "generic" // Humanoid is too big for them and spriting a new one is really annoying.

slowdown = -1
slowdown = -0.5
snow_movement = -2 // Ignores light snow
item_slowdown_mod = 2 // Tiny birds don't like heavy things
total_health = 50
Expand Down Expand Up @@ -212,4 +212,4 @@
H.Stun(1)
playsound(H, "rustle", 25, 1)
return TRUE
*/
*/
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
name = "Haste"
desc = "Allows you to move faster on average than baseline."
cost = 4
var_changes = list("slowdown" = -0.5)
var_changes = list("slowdown" = 0) //RS EDIT - PENDING POTENTIAL REMOVAL DUE TO INCREASED BASE SPEED

/datum/trait/positive/hardy
name = "Hardy"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
name = SPECIES_XENO_HUNTER
weeds_plasma_rate = 5
caste_name = "hunter"
slowdown = -1
slowdown = -0.5
total_health = 150
tail = "xenos_hunter_tail"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
outgoing_melee_damage_percent = 1.3
attack_speed_percent = 1.3
accuracy = 30
slowdown = -1
slowdown = -0.5
evasion = 30

// Variant that automatically commands nearby allies to follow it when created.
Expand Down
5 changes: 1 addition & 4 deletions code/modules/xenobio/items/extracts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@
stacks = MODIFIER_STACK_EXTEND

evasion = 30
slowdown = -1
slowdown = -0.5
attack_speed_percent = 0.75


Expand Down Expand Up @@ -988,6 +988,3 @@
/decl/chemical_reaction/instant/slime/rainbow_unity/on_reaction(var/datum/reagents/holder)
new /obj/item/slimepotion/unity(get_turf(holder.my_atom))
..()



0 comments on commit 6924b7b

Please sign in to comment.