cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 10:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes british spelling of armor from armor_penetration vars (#30104)

Browse Source 
* spelling

* manually rename last armour pen

* Update code/game/objects/obj_defense.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

* Update goldgrub.dm

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
This commit is contained in:
kyunkyunkyun
2025-09-01 09:27:52 +05:00
committed by GitHub
parent 3216ab1c00
commit 626eaaeb79
65 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/staff.dm
+1 -1
View File
@@ -10,7 +10,7 @@
throw_speed = 1
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
armour_penetration_percentage = 100
armor_penetration_percentage = 100
attack_verb = list("bludgeoned", "whacked", "disciplined")
resistance_flags = FLAMMABLE
code/game/objects/items/weapons/batons.dm
+2 -2
View File
@@ -19,7 +19,7 @@
/// The amount of stamina damage the baton does per swing
var/stamina_damage = 30
/// How much melee armour is ignored by the stamina damage
var/stamina_armour_pen = 0
var/stamina_armor_pen = 0
/// The stun time (in seconds) for non-silicons
var/knockdown_duration = 6 SECONDS
/// The stun time (in seconds) for silicons
@@ -122,7 +122,7 @@
* * user - The attacking user
*/
/obj/item/melee/classic_baton/proc/on_non_silicon_stun(mob/living/target, mob/living/user)
var/armour = target.run_armor_check("chest", armour_penetration_percentage = stamina_armour_pen) // returns their chest melee armour
var/armour = target.run_armor_check("chest", armor_penetration_percentage = stamina_armor_pen) // returns their chest melee armour
var/percentage_reduction = 0
if(ishuman(target))
percentage_reduction = (100 - ARMOUR_VALUE_TO_PERCENTAGE(armour)) / 100
code/game/objects/items/weapons/holy_weapons.dm
+1 -1
View File
@@ -248,7 +248,7 @@
item_state = "scythe0"
desc = "Ask not for whom the bell tolls..."
w_class = WEIGHT_CLASS_BULKY
armour_penetration_flat = 30
armor_penetration_flat = 30
slot_flags = ITEM_SLOT_BACK
sharp = TRUE
attack_verb = list("chopped", "sliced", "cut", "reaped")
code/game/objects/items/weapons/melee/energy_melee_weapons.dm
+5 -5
View File
@@ -181,7 +181,7 @@
w_class_on = WEIGHT_CLASS_HUGE
hitsound = 'sound/weapons/bladeslice.ogg'
flags = CONDUCT
armour_penetration_percentage = 100
armor_penetration_percentage = 100
origin_tech = "combat=4;magnets=3"
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
attack_verb_on = list()
@@ -207,8 +207,8 @@
hitsound = "swing_hit"
embed_chance = 75
embedded_impact_pain_multiplier = 10
armour_penetration_percentage = 50
armour_penetration_flat = 10
armor_penetration_percentage = 50
armor_penetration_flat = 10
origin_tech = "combat=3;magnets=4;syndicate=4"
sharp = TRUE
var/hacked = FALSE
@@ -345,8 +345,8 @@
throwforce_on = 10 // No PvP shenanigans, this is main weapon in PvE explorer gameplay and can be obtained very easy
embed_chance = 45
embedded_impact_pain_multiplier = 4
armour_penetration_percentage = 0
armour_penetration_flat = 0
armor_penetration_percentage = 0
armor_penetration_flat = 0
icon_state = "cutlass0"
icon_state_on = "cutlass1"
light_color = LIGHT_COLOR_RED
code/game/objects/items/weapons/melee/melee.dm
+5 -5
View File
@@ -14,7 +14,7 @@
force = 15
throwforce = 10
w_class = WEIGHT_CLASS_BULKY
armour_penetration_percentage = 75
armor_penetration_percentage = 75
sharp = TRUE
origin_tech = null
attack_verb = list("lunged at", "stabbed")
@@ -112,7 +112,7 @@
flags = CONDUCT
force = 5
throwforce = 5
armour_penetration_flat = 30
armor_penetration_flat = 30
w_class = WEIGHT_CLASS_BULKY
sharp = TRUE
origin_tech = "combat=6;syndicate=5"
@@ -280,8 +280,8 @@
force_on = 40
throw_speed = 1
throw_range = 5
armour_penetration_percentage = 50
armour_penetration_flat = 10
armor_penetration_percentage = 50
armor_penetration_flat = 10
/obj/item/chainsaw/syndie/Initialize(mapload)
. = ..()
@@ -310,7 +310,7 @@
/obj/item/chainsaw/doomslayer
name = "OOOH BABY"
desc = "<span class='warning'>VRRRRRRR!!!</span>"
armour_penetration_percentage = 100
armor_penetration_percentage = 100
force_on = 30
/obj/item/chainsaw/doomslayer/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
code/game/objects/items/weapons/melee/spellblade.dm
+1 -1
View File
@@ -9,7 +9,7 @@
resistance_flags = LAVA_PROOF | FIRE_PROOF
w_class = WEIGHT_CLASS_BULKY
force = 25
armour_penetration_flat = 50
armor_penetration_flat = 50
sharp = TRUE
new_attack_chain = TRUE
///enchantment holder, gives it unique on hit effects.
code/game/objects/items/weapons/twohanded.dm
+7 -7
View File
@@ -55,8 +55,8 @@
/obj/item/fireaxe/energized
desc = "Someone with a love for fire axes decided to turn this one into a high-powered energy weapon. Seems excessive."
force_wielded = 35
armour_penetration_flat = 10
armour_penetration_percentage = 30
armor_penetration_flat = 10
armor_penetration_percentage = 30
var/charge = 20
var/max_charge = 20
@@ -106,8 +106,8 @@
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
var/w_class_on = WEIGHT_CLASS_BULKY
armour_penetration_flat = 10
armour_penetration_percentage = 50
armor_penetration_flat = 10
armor_penetration_percentage = 50
origin_tech = "magnets=4;syndicate=5"
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)
@@ -279,7 +279,7 @@
var/force_wielded = 18
throwforce = 20
throw_speed = 4
armour_penetration_flat = 5
armor_penetration_flat = 5
materials = list(MAT_METAL = 1150, MAT_GLASS = 2075)
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
@@ -350,7 +350,7 @@
force_unwielded = 11
force_wielded = 20 //I have no idea how to balance
throwforce = 22
armour_penetration_percentage = 15 //Enhanced armor piercing
armor_penetration_percentage = 15 //Enhanced armor piercing
//Blatant imitation of spear, but all natural. Also not valid for explosive modification.
/obj/item/spear/bamboo
@@ -627,7 +627,7 @@
flags = ABSTRACT | NODROP | DROPDEL
force = 22
damtype = BURN
armour_penetration_percentage = 50
armor_penetration_percentage = 50
sharp = TRUE
attack_effect_override = ATTACK_EFFECT_CLAW
hitsound = 'sound/weapons/bladeslice.ogg'