Update files

This commit is contained in:
SandPoot
2022-04-06 18:41:31 -03:00
parent 4c3fa08cdf
commit 586a035132
881 changed files with 1599 additions and 1599 deletions
+3 -3
View File
@@ -8,7 +8,7 @@
var/sword_color
total_mass = 0.4 //Survival flashlights typically weigh around 5 ounces.
/obj/item/melee/transforming/energy/Initialize()
/obj/item/melee/transforming/energy/Initialize(mapload)
. = ..()
total_mass_on = (total_mass_on ? total_mass_on : (w_class_on * 0.75))
if(active)
@@ -331,7 +331,7 @@
sharpness = SHARP_EDGED
//Most of the other special functions are handled in their own files. aka special snowflake code so kewl
/obj/item/melee/transforming/energy/blade/Initialize()
/obj/item/melee/transforming/energy/blade/Initialize(mapload)
. = ..()
spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
@@ -371,7 +371,7 @@
light_color = "#37FFF7"
actions_types = list()
/obj/item/melee/transforming/energy/sword/cx/Initialize()
/obj/item/melee/transforming/energy/sword/cx/Initialize(mapload)
icon_state_on = icon_state
return ..()
+7 -7
View File
@@ -46,7 +46,7 @@
sharpness = SHARP_EDGED
total_mass = TOTAL_MASS_HAND_REPLACEMENT
/obj/item/melee/synthetic_arm_blade/Initialize()
/obj/item/melee/synthetic_arm_blade/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 60, 80) //very imprecise
@@ -84,7 +84,7 @@
parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK
parry_automatic_enabled = TRUE
/obj/item/melee/sabre/Initialize()
/obj/item/melee/sabre/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 30, 95, 5) //fast and effective, but as a sword, it might damage the results.
AddElement(/datum/element/sword_point)
@@ -208,7 +208,7 @@
. |= BLOCK_SHOULD_REDIRECT
return_list[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_DEFLECT
/obj/item/melee/rapier/Initialize()
/obj/item/melee/rapier/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 20, 65, 0)
@@ -277,7 +277,7 @@
wound_bonus = 15
/obj/item/melee/classic_baton/Initialize()
/obj/item/melee/classic_baton/Initialize(mapload)
. = ..()
if(sword_point)
AddElement(/datum/element/sword_point)
@@ -518,7 +518,7 @@
var/balanced = 1
force_string = "INFINITE"
/obj/item/melee/supermatter_sword/Initialize()
/obj/item/melee/supermatter_sword/Initialize(mapload)
. = ..()
shard = new /obj/machinery/power/supermatter_crystal(src)
qdel(shard.countdown)
@@ -625,7 +625,7 @@
var/datum/beam/beam
total_mass = 2.5
/obj/item/melee/roastingstick/Initialize()
/obj/item/melee/roastingstick/Initialize(mapload)
. = ..()
if (!ovens)
ovens = typecacheof(list(/obj/singularity, /obj/machinery/power/supermatter_crystal, /obj/structure/bonfire, /obj/structure/destructible/clockwork/massive/ratvar))
@@ -741,7 +741,7 @@
var/overlay_state = "mace_handle"
var/mutable_appearance/overlay
/obj/item/melee/cleric_mace/Initialize()
/obj/item/melee/cleric_mace/Initialize(mapload)
. = ..()
overlay = mutable_appearance(icon, overlay_state)
overlay.appearance_flags = RESET_COLOR
@@ -15,7 +15,7 @@
var/clumsy_check = TRUE
var/total_mass_on //Total mass in ounces when transformed. Primarily for balance purposes. Don't think about it too hard.
/obj/item/melee/transforming/Initialize()
/obj/item/melee/transforming/Initialize(mapload)
. = ..()
if(active)
if(attack_verb_on.len)