mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] Initialize fixing (#10335)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
2e725a0727
commit
ce2446922e
@@ -49,7 +49,7 @@
|
||||
..() //CHOMPEdit if you see this, it is a cry for help. Please tell people to stop putting ..() at the top of New() :(
|
||||
|
||||
//CHOMPEdit Start
|
||||
/obj/item/gun/energy/Initialize()
|
||||
/obj/item/gun/energy/Initialize(mapload)
|
||||
. = ..()
|
||||
update_icon()
|
||||
//CHOMPEdit End
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
var/obj/item/stock_parts/scanning_module/scanmod
|
||||
var/dropnoms_active = TRUE
|
||||
|
||||
/obj/item/bluespace_harpoon/Initialize()
|
||||
/obj/item/bluespace_harpoon/Initialize(mapload)
|
||||
. = ..()
|
||||
scanmod = new(src)
|
||||
update_fail_chance()
|
||||
|
||||
@@ -223,7 +223,7 @@
|
||||
var/type_name = null
|
||||
projectile_type = /obj/item/projectile/beam
|
||||
|
||||
/obj/item/ammo_casing/microbattery/Initialize()
|
||||
/obj/item/ammo_casing/microbattery/Initialize(mapload)
|
||||
. = ..()
|
||||
pixel_x = rand(-10, 10)
|
||||
pixel_y = rand(-10, 10)
|
||||
|
||||
@@ -170,7 +170,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()
|
||||
|
||||
@@ -165,7 +165,7 @@
|
||||
/* var/remainingshots = 0 //you may get a limited number of shots regardless of the charge //CHOMPedit: no
|
||||
var/failurechance = 0 //chance per shot of something going awry
|
||||
|
||||
/obj/item/gun/energy/captain/Initialize()
|
||||
/obj/item/gun/energy/captain/Initialize(mapload)
|
||||
//it's an antique and it's been sitting in a case, unmaintained, for who the hell knows how long - who knows what'll happen when you pull it out?
|
||||
..()
|
||||
//first, we decide, does it have a different type of beam? 75% of just being a 40-damage laser, 15% of being less or 0, 10% of being better
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
is_picked_up = FALSE
|
||||
update_transform()
|
||||
|
||||
/obj/item/gun/energy/laser/Initialize()
|
||||
/obj/item/gun/energy/laser/Initialize(mapload)
|
||||
. = ..()
|
||||
if((!(type == /obj/item/gun/energy/laser)) && !is64x32_override)
|
||||
is64x32 = FALSE
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
list(mode_name="prune reagents", projectile_type=/obj/item/projectile/energy/floraprune, modifystate="floramut"),
|
||||
)
|
||||
|
||||
/obj/item/gun/energy/floragun/Initialize()
|
||||
/obj/item/gun/energy/floragun/Initialize(mapload)
|
||||
. = ..()
|
||||
emitter = new(src)
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
return new projectile_type(src)
|
||||
|
||||
/obj/item/gun/magic/Initialize()
|
||||
/obj/item/gun/magic/Initialize(mapload)
|
||||
. = ..()
|
||||
charges = max_charges
|
||||
if(can_charge)
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
else
|
||||
rating_modifier = FALSE
|
||||
|
||||
/obj/item/gun/magnetic/matfed/Initialize()
|
||||
/obj/item/gun/magnetic/matfed/Initialize(mapload)
|
||||
. = ..()
|
||||
if(ispath(manipulator))
|
||||
manipulator = new manipulator(src)
|
||||
@@ -196,7 +196,7 @@
|
||||
else // rating_mod 0 = something's not right
|
||||
. += span_warning("A display on the side slowly scrolls the text \"ERR: MISSING COMPONENT - EFFICIENCY MODIFICATION INCOMPLETE\".")
|
||||
|
||||
/obj/item/gun/magnetic/matfed/phoronbore/Initialize()
|
||||
/obj/item/gun/magnetic/matfed/phoronbore/Initialize(mapload)
|
||||
. = ..()
|
||||
soundloop = new(list(src), 0)
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
var/state = 0
|
||||
|
||||
/obj/item/gun/magnetic/Initialize()
|
||||
/obj/item/gun/magnetic/Initialize(mapload)
|
||||
. = ..()
|
||||
// So you can have some spawn with components
|
||||
if(ispath(cell))
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
is_picked_up = FALSE
|
||||
update_transform()
|
||||
|
||||
/obj/item/gun/magnetic/railgun/Initialize()
|
||||
/obj/item/gun/magnetic/railgun/Initialize(mapload)
|
||||
. = ..()
|
||||
if((!(type == /obj/item/gun/magnetic/railgun)) && !is64x32_override)
|
||||
is64x32 = FALSE
|
||||
|
||||
@@ -428,7 +428,7 @@
|
||||
icon_state = "mini-uzi-empty"
|
||||
|
||||
// CHOMPEdit: Uzi tilting
|
||||
/obj/item/gun/projectile/automatic/mini_uzi/Initialize()
|
||||
/obj/item/gun/projectile/automatic/mini_uzi/Initialize(mapload)
|
||||
. = ..()
|
||||
if(is64x32)
|
||||
update_transform()
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
/obj/item/gun/projectile/smartgun/loaded
|
||||
magazine_type = /obj/item/ammo_magazine/smartgun
|
||||
|
||||
/obj/item/gun/projectile/smartgun/Initialize()
|
||||
/obj/item/gun/projectile/smartgun/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!mag_underlay)
|
||||
mag_underlay = mutable_appearance(icon, icon_state = "smartgun_mag")
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
//icon_scale_x = 0.5
|
||||
//icon_scale_y = 0.5
|
||||
|
||||
/obj/item/gun/projectile/automatic/cballistic/Initialize()
|
||||
/obj/item/gun/projectile/automatic/cballistic/Initialize(mapload)
|
||||
. = ..()
|
||||
update_transform()
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
var/is_picked_up = FALSE
|
||||
var/is_long = TRUE
|
||||
|
||||
/obj/item/gun/projectile/automatic/serdy/Initialize()
|
||||
/obj/item/gun/projectile/automatic/serdy/Initialize(mapload)
|
||||
. = ..()
|
||||
update_transform()
|
||||
update_icon()
|
||||
@@ -1232,7 +1232,7 @@
|
||||
icon_state = "c20r"
|
||||
return
|
||||
|
||||
/obj/item/gun/projectile/automatic/c20r/Initialize()
|
||||
/obj/item/gun/projectile/automatic/c20r/Initialize(mapload)
|
||||
. = ..()
|
||||
update_transform()
|
||||
|
||||
@@ -1251,7 +1251,7 @@
|
||||
. = ..()
|
||||
icon_state = ammo_magazine ? "[initial(icon_state)]" : "[initial(icon_state)]-e"
|
||||
|
||||
/obj/item/gun/projectile/automatic/sts35/Initialize()
|
||||
/obj/item/gun/projectile/automatic/sts35/Initialize(mapload)
|
||||
. = ..()
|
||||
update_transform()
|
||||
|
||||
@@ -1270,7 +1270,7 @@
|
||||
. = ..()
|
||||
icon_state = ammo_magazine ? "[initial(icon_state)]" : "[initial(icon_state)]-e"
|
||||
|
||||
/obj/item/gun/projectile/automatic/wt550/Initialize()
|
||||
/obj/item/gun/projectile/automatic/wt550/Initialize(mapload)
|
||||
. = ..()
|
||||
update_transform()
|
||||
|
||||
@@ -1293,7 +1293,7 @@
|
||||
icon_state = "carbine-e"
|
||||
return
|
||||
|
||||
/obj/item/gun/projectile/automatic/z8/Initialize()
|
||||
/obj/item/gun/projectile/automatic/z8/Initialize(mapload)
|
||||
. = ..()
|
||||
update_transform()
|
||||
|
||||
@@ -1322,7 +1322,7 @@
|
||||
. = ..()
|
||||
icon_state = ammo_magazine ? "[initial(icon_state)]" : "[initial(icon_state)]-empty"
|
||||
|
||||
/obj/item/gun/projectile/automatic/mini_uzi/Initialize()
|
||||
/obj/item/gun/projectile/automatic/mini_uzi/Initialize(mapload)
|
||||
. = ..()
|
||||
update_transform()
|
||||
|
||||
@@ -1396,7 +1396,7 @@
|
||||
icon = 'icons/obj/gun_ch.dmi'
|
||||
icon_state = "m1911"
|
||||
|
||||
/obj/item/gun/projectile/colt/Initialize()
|
||||
/obj/item/gun/projectile/colt/Initialize(mapload)
|
||||
.=..()
|
||||
update_icon()
|
||||
|
||||
@@ -1576,7 +1576,7 @@
|
||||
var/is64x32 = TRUE
|
||||
var/is_picked_up = FALSE
|
||||
|
||||
/obj/item/gun/projectile/shotgun/pump/Initialize()
|
||||
/obj/item/gun/projectile/shotgun/pump/Initialize(mapload)
|
||||
. = ..()
|
||||
if(is64x32)
|
||||
update_transform()
|
||||
@@ -1671,7 +1671,7 @@
|
||||
/obj/item/gun/projectile/shotgun/doublebarrel/sawn //Default sawn shotgun needs it's old icon path back
|
||||
icon = 'icons/obj/gun.dmi'
|
||||
|
||||
/obj/item/gun/projectile/shotgun/doublebarrel/Initialize()
|
||||
/obj/item/gun/projectile/shotgun/doublebarrel/Initialize(mapload)
|
||||
. = ..()
|
||||
update_transform()
|
||||
update_icon()
|
||||
|
||||
Reference in New Issue
Block a user