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
@@ -26,7 +26,7 @@
name = "spent bullet casing"
BB = null
/obj/item/ammo_casing/Initialize()
/obj/item/ammo_casing/Initialize(mapload)
. = ..()
if(projectile_type)
BB = new projectile_type(src)
@@ -124,7 +124,7 @@
projectile_type = /obj/item/projectile/bullet/dart
var/reagent_amount = 30
/obj/item/ammo_casing/shotgun/dart/Initialize()
/obj/item/ammo_casing/shotgun/dart/Initialize(mapload)
. = ..()
create_reagents(reagent_amount, OPENCONTAINER)
@@ -137,7 +137,7 @@
icon_state = "cnrshell"
reagent_amount = 10
/obj/item/ammo_casing/shotgun/dart/noreact/Initialize()
/obj/item/ammo_casing/shotgun/dart/noreact/Initialize(mapload)
. = ..()
reagents.reagents_holder_flags |= NO_REACT
@@ -146,7 +146,7 @@
projectile_type = /obj/item/projectile/bullet/dart/piercing
reagent_amount = 50
/obj/item/ammo_casing/shotgun/dart/bioterror/Initialize()
/obj/item/ammo_casing/shotgun/dart/bioterror/Initialize(mapload)
. = ..()
reagents.add_reagent(/datum/reagent/toxin/amanitin, 12) //for a nasty surprise after you get shot and somehow escape and don't think to quickly purge, and even shock those who are loaded up on purging agents
reagents.add_reagent(/datum/reagent/toxin/chloralhydrate, 6)
@@ -23,7 +23,7 @@
var/list/bullet_cost
var/list/base_cost// override this one as well if you override bullet_cost
/obj/item/ammo_box/Initialize()
/obj/item/ammo_box/Initialize(mapload)
. = ..()
if (!bullet_cost)
for (var/material in custom_materials)
@@ -67,7 +67,7 @@
var/e_cost = 100
projectile_type = /obj/item/projectile/beam
/obj/item/ammo_casing/mws_batt/Initialize()
/obj/item/ammo_casing/mws_batt/Initialize(mapload)
. = ..()
pixel_x = rand(-10, 10)
pixel_y = rand(-10, 10)
@@ -17,6 +17,6 @@
max_ammo = 6
multiload = 0
/obj/item/ammo_box/magazine/internal/rus357/Initialize()
/obj/item/ammo_box/magazine/internal/rus357/Initialize(mapload)
stored_ammo += new ammo_type(src)
. = ..()
+1 -1
View File
@@ -94,7 +94,7 @@
var/automatic = 0 //can gun use it, 0 is no, anything above 0 is the delay between clicks in ds
/obj/item/gun/Initialize()
/obj/item/gun/Initialize(mapload)
. = ..()
if(no_pin_required)
pin = null
+1 -1
View File
@@ -10,7 +10,7 @@
var/magazine_wording = "magazine"
var/sawn_item_state = "gun"
/obj/item/gun/ballistic/Initialize()
/obj/item/gun/ballistic/Initialize(mapload)
. = ..()
if(!spawnwithmagazine)
update_icon()
@@ -110,7 +110,7 @@
/obj/item/gun/ballistic/automatic/c20r/unrestricted
pin = /obj/item/firing_pin
/obj/item/gun/ballistic/automatic/c20r/Initialize()
/obj/item/gun/ballistic/automatic/c20r/Initialize(mapload)
. = ..()
update_icon()
@@ -172,7 +172,7 @@
burst_shot_delay = 2
pin = /obj/item/firing_pin/implant/pindicate
/obj/item/gun/ballistic/automatic/m90/Initialize()
/obj/item/gun/ballistic/automatic/m90/Initialize(mapload)
. = ..()
underbarrel = new /obj/item/gun/ballistic/revolver/grenadelauncher(src)
update_icon()
@@ -180,7 +180,7 @@
/obj/item/gun/ballistic/automatic/m90/unrestricted
pin = /obj/item/firing_pin
/obj/item/gun/ballistic/automatic/m90/unrestricted/Initialize()
/obj/item/gun/ballistic/automatic/m90/unrestricted/Initialize(mapload)
. = ..()
underbarrel = new /obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted(src)
update_icon()
@@ -274,7 +274,7 @@
/obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted
pin = /obj/item/firing_pin
/obj/item/gun/ballistic/automatic/shotgun/bulldog/Initialize()
/obj/item/gun/ballistic/automatic/shotgun/bulldog/Initialize(mapload)
. = ..()
update_icon()
@@ -21,7 +21,7 @@
var/obj/item/stock_parts/cell/cell
var/cell_type = /obj/item/stock_parts/cell/magnetic
/obj/item/gun/ballistic/automatic/magrifle/Initialize()
/obj/item/gun/ballistic/automatic/magrifle/Initialize(mapload)
. = ..()
if(cell_type)
cell = new cell_type(src)
@@ -6,7 +6,7 @@
fire_sound = "sound/weapons/revolvershot.ogg"
casing_ejector = FALSE
/obj/item/gun/ballistic/revolver/Initialize()
/obj/item/gun/ballistic/revolver/Initialize(mapload)
. = ..()
if(!istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
verbs += /obj/item/gun/ballistic/revolver/verb/spin
@@ -109,7 +109,7 @@
)
var/list/safe_calibers
/obj/item/gun/ballistic/revolver/detective/Initialize()
/obj/item/gun/ballistic/revolver/detective/Initialize(mapload)
. = ..()
safe_calibers = magazine.caliber
@@ -191,7 +191,7 @@
. = ..()
spun = TRUE
/obj/item/gun/ballistic/revolver/russian/Initialize()
/obj/item/gun/ballistic/revolver/russian/Initialize(mapload)
. = ..()
do_spin()
spun = TRUE
@@ -192,7 +192,7 @@
flags_1 = NONE
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage
/obj/item/gun/ballistic/shotgun/boltaction/enchanted/Initialize()
/obj/item/gun/ballistic/shotgun/boltaction/enchanted/Initialize(mapload)
. = ..()
bolt_open = TRUE
pump()
@@ -303,7 +303,7 @@
. = ..()
. += "<span class='notice'>Alt-click to pump it.</span>"
/obj/item/gun/ballistic/shotgun/automatic/dual_tube/Initialize()
/obj/item/gun/ballistic/shotgun/automatic/dual_tube/Initialize(mapload)
. = ..()
if (!alternate_magazine)
alternate_magazine = new mag_type(src)
@@ -35,7 +35,7 @@
/obj/item/gun/ballistic/automatic/toy/pistol/riot
mag_type = /obj/item/ammo_box/magazine/toy/pistol/riot
/obj/item/gun/ballistic/automatic/toy/pistol/riot/Initialize()
/obj/item/gun/ballistic/automatic/toy/pistol/riot/Initialize(mapload)
magazine = new /obj/item/ammo_box/magazine/toy/pistol/riot(src)
return ..()
+1 -1
View File
@@ -49,7 +49,7 @@
/obj/item/gun/energy/get_cell()
return cell
/obj/item/gun/energy/Initialize()
/obj/item/gun/energy/Initialize(mapload)
. = ..()
if(cell_type)
cell = new cell_type(src)
@@ -168,7 +168,7 @@
/obj/item/gun/energy/dueling/hugbox/stamina
hugbox = DUEL_HUGBOX_NONLETHAL
/obj/item/gun/energy/dueling/Initialize()
/obj/item/gun/energy/dueling/Initialize(mapload)
. = ..()
setting_overlay = mutable_appearance(icon,setting_iconstate())
add_overlay(setting_overlay)
@@ -22,7 +22,7 @@
gunlight_state = "mini-light"
can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
/obj/item/gun/energy/e_gun/mini/Initialize()
/obj/item/gun/energy/e_gun/mini/Initialize(mapload)
gun_light = new /obj/item/flashlight/seclite(src)
return ..()
@@ -125,7 +125,7 @@
holds_charge = TRUE
unique_frequency = TRUE
/obj/item/gun/energy/kinetic_accelerator/Initialize()
/obj/item/gun/energy/kinetic_accelerator/Initialize(mapload)
. = ..()
if(!holds_charge)
empty()
@@ -204,7 +204,7 @@
throwforce = 10
obj_flags = UNIQUE_RENAME
/obj/item/gun/energy/laser/redtag/hitscan/chaplain/Initialize()
/obj/item/gun/energy/laser/redtag/hitscan/chaplain/Initialize(mapload)
. = ..()
AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, null, FALSE)
@@ -17,7 +17,7 @@
var/overheat_max = 50
var/heat_diffusion = 1
/obj/item/minigunpack/Initialize()
/obj/item/minigunpack/Initialize(mapload)
. = ..()
gun = new(src)
START_PROCESSING(SSfastprocess, src)
@@ -114,7 +114,7 @@
item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND
var/obj/item/minigunpack/ammo_pack
/obj/item/gun/energy/minigun/Initialize()
/obj/item/gun/energy/minigun/Initialize(mapload)
if(istype(loc, /obj/item/minigunpack)) //We should spawn inside an ammo pack so let's use that one.
ammo_pack = loc
else
@@ -17,7 +17,7 @@
/obj/item/gun/energy/pulse/prize
pin = /obj/item/firing_pin
/obj/item/gun/energy/pulse/prize/Initialize()
/obj/item/gun/energy/pulse/prize/Initialize(mapload)
. = ..()
GLOB.poi_list += src
var/turf/T = get_turf(src)
+1 -1
View File
@@ -49,7 +49,7 @@
charges--//... drain a charge
recharge_newshot()
/obj/item/gun/magic/Initialize()
/obj/item/gun/magic/Initialize(mapload)
. = ..()
charges = max_charges
chambered = new ammo_type(src)
@@ -23,7 +23,7 @@
block_parry_data = /datum/block_parry_data/motivation
//to get this to toggle correctly
/obj/item/gun/magic/staff/motivation/Initialize()
/obj/item/gun/magic/staff/motivation/Initialize(mapload)
. = ..()
judgementcut = new(src)
+1 -1
View File
@@ -86,7 +86,7 @@
sharpness = SHARP_EDGED
max_charges = 4
/obj/item/gun/magic/staff/spellblade/Initialize()
/obj/item/gun/magic/staff/spellblade/Initialize(mapload)
. = ..()
AddComponent(/datum/component/butchering, 15, 125, 0, hitsound)
+1 -1
View File
@@ -9,7 +9,7 @@
max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths)
var/variable_charges = 1
/obj/item/gun/magic/wand/Initialize()
/obj/item/gun/magic/wand/Initialize(mapload)
if(prob(75) && variable_charges) //25% chance of listed max charges, 50% chance of 1/2 max charges, 25% chance of 1/3 max charges
if(prob(33))
max_charges = CEILING(max_charges / 3, 1)
@@ -169,7 +169,7 @@
to_chat(user, "<span class='boldnotice'>You set \the [src] to [projectile_setting_pierce? "pierce":"impact"] mode.</span>")
aiming_beam()
/obj/item/gun/energy/beam_rifle/Initialize()
/obj/item/gun/energy/beam_rifle/Initialize(mapload)
. = ..()
fire_delay = delay
current_tracers = list()
@@ -26,7 +26,7 @@
debug_power = 80
bombcheck = FALSE
/obj/item/gun/blastcannon/Initialize()
/obj/item/gun/blastcannon/Initialize(mapload)
. = ..()
if(!pin)
pin = new
@@ -25,7 +25,7 @@
var/can_hitscan = FALSE
var/hitscan_mode = FALSE
/obj/item/gun/energy/laser/chameleon/Initialize()
/obj/item/gun/energy/laser/chameleon/Initialize(mapload)
. = ..()
chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/gun
@@ -21,7 +21,7 @@
var/list/allowed_containers = list(/obj/item/reagent_containers/glass/bottle/vial/small, /obj/item/reagent_containers/glass/bottle/vial/large)
var/quickload = TRUE
/obj/item/gun/chem/Initialize()
/obj/item/gun/chem/Initialize(mapload)
. = ..()
chambered = new /obj/item/ammo_casing/chemgun(src)
START_PROCESSING(SSobj, src)
@@ -111,7 +111,7 @@
icon_state = "chemgunrepeater"
item_state = "syringegun"
obj/item/gun/chem/smart/Initialize()
obj/item/gun/chem/smart/Initialize(mapload)
. = ..()
chambered = new /obj/item/ammo_casing/chemgun/smart(src)
@@ -16,7 +16,7 @@
weapon_weight = WEAPON_MEDIUM
/obj/item/gun/medbeam/Initialize()
/obj/item/gun/medbeam/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
@@ -130,6 +130,6 @@
/obj/item/gun/medbeam/mech
mounted = 1
/obj/item/gun/medbeam/mech/Initialize()
/obj/item/gun/medbeam/mech/Initialize(mapload)
. = ..()
STOP_PROCESSING(SSobj, src) //Mech mediguns do not process until installed, and are controlled by the holder obj
@@ -14,7 +14,7 @@
var/list/syringes = list()
var/max_syringes = 1
/obj/item/gun/syringe/Initialize()
/obj/item/gun/syringe/Initialize(mapload)
. = ..()
chambered = new /obj/item/ammo_casing/syringegun(src)
@@ -83,7 +83,7 @@
name = "modified syringe gun"
desc = "A syringe gun that has been modified to fit DNA injectors instead of normal syringes."
/obj/item/gun/syringe/dna/Initialize()
/obj/item/gun/syringe/dna/Initialize(mapload)
. = ..()
chambered = new /obj/item/ammo_casing/dnainjector(src)
@@ -113,7 +113,7 @@
suppressed = TRUE //Softer fire sound
can_unsuppress = FALSE
/obj/item/gun/syringe/dart/Initialize()
/obj/item/gun/syringe/dart/Initialize(mapload)
. = ..()
chambered = new /obj/item/ammo_casing/syringegun/dart(src)
+2 -2
View File
@@ -13,7 +13,7 @@
var/pin_removeable = 0 // Can be replaced by any pin.
var/obj/item/gun/gun
/obj/item/firing_pin/Initialize(newloc)
/obj/item/firing_pin/Initialize(mapload, newloc)
. = ..()
if(istype(newloc, /obj/item/gun))
gun = newloc
@@ -238,7 +238,7 @@
var/only_lethals = FALSE
var/can_toggle = TRUE
/obj/item/firing_pin/security_level/Initialize()
/obj/item/firing_pin/security_level/Initialize(mapload)
. = ..()
fail_message = "<span class='warning'>INVALID SECURITY LEVEL. CURRENT: [uppertext(NUM2SECLEVEL(GLOB.security_level))]. \
MIN: [uppertext(NUM2SECLEVEL(min_sec_level))]. MAX: [uppertext(NUM2SECLEVEL(max_sec_level))]. \
+1 -1
View File
@@ -166,7 +166,7 @@
/// For telling whether we want to roll for bone breaking or lacerations if we're bothering with wounds
sharpness = SHARP_NONE
/obj/item/projectile/Initialize()
/obj/item/projectile/Initialize(mapload)
. = ..()
permutated = list()
decayedRange = range
+1 -1
View File
@@ -30,7 +30,7 @@
wound_bonus = 0
damage = 25
/obj/item/projectile/beam/laser/hellfire/Initialize()
/obj/item/projectile/beam/laser/hellfire/Initialize(mapload)
. = ..()
transform *= 2
@@ -4,7 +4,7 @@
damage = 6
var/piercing = FALSE
/obj/item/projectile/bullet/dart/Initialize()
/obj/item/projectile/bullet/dart/Initialize(mapload)
. = ..()
create_reagents(50, NO_REACT, NO_REAGENTS_VALUE)
@@ -32,13 +32,13 @@
/obj/item/projectile/bullet/dart/piercing
piercing = TRUE
/obj/item/projectile/bullet/dart/metalfoam/Initialize()
/obj/item/projectile/bullet/dart/metalfoam/Initialize(mapload)
. = ..()
reagents.add_reagent(/datum/reagent/aluminium, 15)
reagents.add_reagent(/datum/reagent/foaming_agent, 5)
reagents.add_reagent(/datum/reagent/toxin/acid, 5)
/obj/item/projectile/bullet/dart/catranq/Initialize()
/obj/item/projectile/bullet/dart/catranq/Initialize(mapload)
. = ..()
reagents.add_reagent(/datum/reagent/fermi/furranium, 5) // Turns out I don't even need to give this guy actual tranquilizer chems.
@@ -71,7 +71,7 @@
var/atom/throw_target = get_edge_target_turf(M, get_dir(src, get_step_away(M, src)))
M.safe_throw_at(throw_target, 3, 2)
/obj/item/projectile/bullet/shotgun_meteorslug/Initialize()
/obj/item/projectile/bullet/shotgun_meteorslug/Initialize(mapload)
. = ..()
SpinAnimation()
@@ -118,7 +118,7 @@
wound_bonus = 0
bare_wound_bonus = 7.5
/obj/item/projectile/bullet/pellet/shotgun_improvised/Initialize()
/obj/item/projectile/bullet/pellet/shotgun_improvised/Initialize(mapload)
. = ..()
range = rand(1, 8)
@@ -11,7 +11,7 @@
icon_state = "banana"
range = 200
/obj/item/projectile/bullet/honker/Initialize()
/obj/item/projectile/bullet/honker/Initialize(mapload)
. = ..()
SpinAnimation()
@@ -6,7 +6,7 @@
hitsound = 'sound/weapons/taserhit.ogg'
range = 10
/obj/item/projectile/energy/net/Initialize()
/obj/item/projectile/energy/net/Initialize(mapload)
. = ..()
SpinAnimation()
@@ -29,7 +29,7 @@
light_range = 3
anchored = TRUE
/obj/effect/nettingportal/Initialize()
/obj/effect/nettingportal/Initialize(mapload)
. = ..()
var/obj/item/beacon/teletarget = null
for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
@@ -17,7 +17,7 @@
"purple" = "#FF00FF"
)
/obj/item/projectile/energy/nuclear_particle/Initialize()
/obj/item/projectile/energy/nuclear_particle/Initialize(mapload)
. = ..()
//Random color time!
var/our_color = pick(particle_colors)
+1 -1
View File
@@ -382,7 +382,7 @@
var/weakened_icon = "decursed"
var/auto_destroy = TRUE
/obj/structure/closet/decay/Initialize()
/obj/structure/closet/decay/Initialize(mapload)
. = ..()
if(auto_destroy)
addtimer(CALLBACK(src, .proc/bust_open), 5 MINUTES)
@@ -13,7 +13,7 @@
muzzle_type = /obj/effect/projectile/muzzle/plasma_cutter
impact_type = /obj/effect/projectile/impact/plasma_cutter
/obj/item/projectile/plasma/Initialize()
/obj/item/projectile/plasma/Initialize(mapload)
. = ..()
if(!lavaland_equipment_pressure_check(get_turf(src)))
name = "weakened [name]"