mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
[MIRROR] more new to Init (#10183)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
001ec6a06b
commit
e957f101c5
@@ -65,8 +65,8 @@
|
||||
defend_chance = 40 // The base chance for the weapon to parry.
|
||||
projectile_parry_chance = 15 // The base chance for a projectile to be deflected.
|
||||
|
||||
/obj/item/melee/changeling/New(location)
|
||||
..()
|
||||
/obj/item/melee/changeling/Initialize(mapload)
|
||||
. = ..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
if(ismob(loc))
|
||||
visible_message(span_warning("A grotesque weapon forms around [loc.name]\'s arm!"),
|
||||
|
||||
@@ -264,9 +264,10 @@ var/global/list/changeling_fabricated_clothing = list(
|
||||
access = null
|
||||
canremove = FALSE
|
||||
|
||||
/obj/item/card/id/syndicate/changeling/New(mob/user as mob)
|
||||
..()
|
||||
registered_user = user
|
||||
/obj/item/card/id/syndicate/changeling/Initialize(mapload)
|
||||
. = ..()
|
||||
if(ismob(loc))
|
||||
registered_user = loc
|
||||
|
||||
/obj/item/card/id/syndicate/changeling/Initialize()
|
||||
. = ..()
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
/spell/aoe_turf/conjure/floor/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
|
||||
animation.icon_state = "cultfloor"
|
||||
flick("cultfloor",animation)
|
||||
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), animation), 1 SECOND)
|
||||
QDEL_IN(animation, 1 SECOND)
|
||||
|
||||
/spell/aoe_turf/conjure/wall
|
||||
name = "Lesser Construction"
|
||||
@@ -64,7 +64,7 @@
|
||||
/spell/aoe_turf/conjure/wall/conjure_animation(var/atom/movable/overlay/animation, var/turf/target)
|
||||
animation.icon_state = "cultwall"
|
||||
flick("cultwall",animation)
|
||||
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), animation), 1 SECOND)
|
||||
QDEL_IN(animation, 1 SECOND)
|
||||
|
||||
/spell/aoe_turf/conjure/wall/reinforced
|
||||
name = "Greater Construction"
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
aspect = ASPECT_TELE
|
||||
var/datum/effect/effect/system/spark_spread/sparks
|
||||
|
||||
/obj/item/spell/warp_strike/New()
|
||||
..()
|
||||
/obj/item/spell/warp_strike/Initialize(mapload)
|
||||
. = ..()
|
||||
sparks = new /datum/effect/effect/system/spark_spread()
|
||||
sparks.set_up(5, 0, src)
|
||||
sparks.attach(loc)
|
||||
|
||||
@@ -389,34 +389,30 @@ update_flag
|
||||
add_fingerprint(ui.user)
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/portable_atmospherics/canister/phoron/Initialize() //ChompEDIT New --> Initialize
|
||||
..()
|
||||
/obj/machinery/portable_atmospherics/canister/phoron/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
src.air_contents.adjust_gas(GAS_PHORON, MolesForPressure())
|
||||
src.update_icon()
|
||||
return 1
|
||||
air_contents.adjust_gas(GAS_PHORON, MolesForPressure())
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/portable_atmospherics/canister/oxygen/Initialize() //ChompEDIT New --> Initialize
|
||||
..()
|
||||
/obj/machinery/portable_atmospherics/canister/oxygen/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
src.air_contents.adjust_gas(GAS_O2, MolesForPressure())
|
||||
src.update_icon()
|
||||
return 1
|
||||
air_contents.adjust_gas(GAS_O2, MolesForPressure())
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/portable_atmospherics/canister/oxygen/prechilled/Initialize() //ChompEDIT New --> Initialize
|
||||
..()
|
||||
/obj/machinery/portable_atmospherics/canister/oxygen/prechilled/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
src.air_contents.adjust_gas(GAS_O2, MolesForPressure())
|
||||
src.air_contents.temperature = 80
|
||||
src.update_icon()
|
||||
return 1
|
||||
air_contents.adjust_gas(GAS_O2, MolesForPressure())
|
||||
air_contents.temperature = 80
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/portable_atmospherics/canister/nitrous_oxide/Initialize() //ChompEDIT New --> Initialize
|
||||
..()
|
||||
/obj/machinery/portable_atmospherics/canister/nitrous_oxide/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
air_contents.adjust_gas(GAS_N2O, MolesForPressure())
|
||||
src.update_icon()
|
||||
return 1
|
||||
update_icon()
|
||||
|
||||
//Dirty way to fill room with gas. However it is a bit easier to do than creating some floor/engine/n2o -rastaf0
|
||||
/obj/machinery/portable_atmospherics/canister/nitrous_oxide/roomfiller/Initialize()
|
||||
@@ -426,51 +422,43 @@ update_flag
|
||||
if (istype(src.loc))
|
||||
location.assume_air(air_contents)
|
||||
air_contents = new
|
||||
return 1
|
||||
|
||||
/obj/machinery/portable_atmospherics/canister/nitrogen/Initialize() //ChompEDIT New --> Initialize
|
||||
/obj/machinery/portable_atmospherics/canister/nitrogen/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
..()
|
||||
air_contents.adjust_gas(GAS_N2, MolesForPressure())
|
||||
update_icon()
|
||||
|
||||
src.air_contents.adjust_gas(GAS_N2, MolesForPressure())
|
||||
src.update_icon()
|
||||
return 1
|
||||
|
||||
/obj/machinery/portable_atmospherics/canister/carbon_dioxide/Initialize() //ChompEDIT New --> Initialize
|
||||
..()
|
||||
src.air_contents.adjust_gas(GAS_CO2, MolesForPressure())
|
||||
src.update_icon()
|
||||
return 1
|
||||
/obj/machinery/portable_atmospherics/canister/carbon_dioxide/Initialize(mapload)
|
||||
. = ..()
|
||||
air_contents.adjust_gas(GAS_CO2, MolesForPressure())
|
||||
update_icon()
|
||||
|
||||
|
||||
/obj/machinery/portable_atmospherics/canister/air/Initialize() //ChompEDIT New --> Initialize
|
||||
..()
|
||||
/obj/machinery/portable_atmospherics/canister/air/Initialize(mapload)
|
||||
. = ..()
|
||||
var/list/air_mix = StandardAirMix()
|
||||
src.air_contents.adjust_multi(GAS_O2, air_mix[GAS_O2], GAS_N2, air_mix[GAS_N2])
|
||||
air_contents.adjust_multi(GAS_O2, air_mix[GAS_O2], GAS_N2, air_mix[GAS_N2])
|
||||
|
||||
src.update_icon()
|
||||
return 1
|
||||
update_icon()
|
||||
|
||||
//R-UST port
|
||||
// Special types used for engine setup admin verb, they contain double amount of that of normal canister.
|
||||
/obj/machinery/portable_atmospherics/canister/nitrogen/engine_setup/Initialize() //ChompEDIT New --> Initialize
|
||||
..()
|
||||
src.air_contents.adjust_gas(GAS_N2, MolesForPressure())
|
||||
src.update_icon()
|
||||
return 1
|
||||
/obj/machinery/portable_atmospherics/canister/nitrogen/engine_setup/Initialize(mapload)
|
||||
. = ..()
|
||||
air_contents.adjust_gas(GAS_N2, MolesForPressure())
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/portable_atmospherics/canister/carbon_dioxide/engine_setup/Initialize() //ChompEDIT New --> Initialize
|
||||
..()
|
||||
src.air_contents.adjust_gas(GAS_CO2, MolesForPressure())
|
||||
src.update_icon()
|
||||
return 1
|
||||
/obj/machinery/portable_atmospherics/canister/carbon_dioxide/engine_setup/Initialize(mapload)
|
||||
. = ..()
|
||||
air_contents.adjust_gas(GAS_CO2, MolesForPressure())
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/portable_atmospherics/canister/phoron/engine_setup/Initialize() //ChompEDIT New --> Initialize
|
||||
..()
|
||||
src.air_contents.adjust_gas(GAS_PHORON, MolesForPressure())
|
||||
src.update_icon()
|
||||
return 1
|
||||
/obj/machinery/portable_atmospherics/canister/phoron/engine_setup/Initialize(mapload)
|
||||
. = ..()
|
||||
air_contents.adjust_gas(GAS_PHORON, MolesForPressure())
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/portable_atmospherics/canister/take_damage(var/damage)
|
||||
src.health -= damage
|
||||
health -= damage
|
||||
healthcheck()
|
||||
|
||||
@@ -13,18 +13,11 @@
|
||||
var/start_pressure = ONE_ATMOSPHERE
|
||||
var/maximum_pressure = 90 * ONE_ATMOSPHERE
|
||||
|
||||
/obj/machinery/portable_atmospherics/New()
|
||||
//..() CHOMP Removal, moved to bottom
|
||||
//VOREStation Edit - Fix runtime
|
||||
/obj/machinery/portable_atmospherics/Initialize(mapload)
|
||||
..()
|
||||
if(air_contents)
|
||||
air_contents.volume = volume
|
||||
air_contents.temperature = T20C
|
||||
//VOREStation Edit End
|
||||
..() //CHOMPEdit. Please for the love of god, do not put ..() at the top of New(), like ever
|
||||
return 1
|
||||
|
||||
/obj/machinery/portable_atmospherics/Initialize()
|
||||
..()
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/obj/machinery/portable_atmospherics/LateInitialize()
|
||||
|
||||
@@ -21,9 +21,11 @@
|
||||
/obj/machinery/portable_atmospherics/powered/pump/filled
|
||||
start_pressure = 90 * ONE_ATMOSPHERE
|
||||
|
||||
/obj/machinery/portable_atmospherics/powered/pump/New()
|
||||
..()
|
||||
cell = new/obj/item/cell/apc(src)
|
||||
/obj/machinery/portable_atmospherics/powered/pump/Initialize(mapload, skip_cell)
|
||||
. = ..()
|
||||
|
||||
if(!skip_cell)
|
||||
cell = new/obj/item/cell/apc(src)
|
||||
|
||||
var/list/air_mix = StandardAirMix()
|
||||
src.air_contents.adjust_multi(GAS_O2, air_mix[GAS_O2], GAS_N2, air_mix[GAS_N2])
|
||||
|
||||
@@ -13,9 +13,8 @@
|
||||
var/global/gid = 1
|
||||
var/id = 0
|
||||
|
||||
/obj/machinery/portable_atmospherics/powered/pump/huge/New()
|
||||
..()
|
||||
cell = null
|
||||
/obj/machinery/portable_atmospherics/powered/pump/huge/Initialize(mapload)
|
||||
. = ..(mapload, TRUE)
|
||||
|
||||
id = gid
|
||||
gid++
|
||||
|
||||
@@ -20,9 +20,10 @@
|
||||
|
||||
var/list/scrubbing_gas = list(GAS_PHORON, GAS_CO2, GAS_N2O, GAS_VOLATILE_FUEL)
|
||||
|
||||
/obj/machinery/portable_atmospherics/powered/scrubber/New()
|
||||
..()
|
||||
cell = new/obj/item/cell/apc(src)
|
||||
/obj/machinery/portable_atmospherics/powered/scrubber/Initialize(mapload, skip_cell)
|
||||
. = ..()
|
||||
if(!skip_cell)
|
||||
cell = new/obj/item/cell/apc(src)
|
||||
|
||||
/obj/machinery/portable_atmospherics/powered/scrubber/emp_act(severity)
|
||||
if(stat & (BROKEN|NOPOWER))
|
||||
@@ -164,9 +165,8 @@
|
||||
var/global/gid = 1
|
||||
var/id = 0
|
||||
|
||||
/obj/machinery/portable_atmospherics/powered/scrubber/huge/New()
|
||||
..()
|
||||
cell = null
|
||||
/obj/machinery/portable_atmospherics/powered/scrubber/huge/Initialize(mapload)
|
||||
. = ..(mapload, TRUE)
|
||||
|
||||
id = gid
|
||||
gid++
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
idle_power_usage = 5
|
||||
active_power_usage = 10
|
||||
plane = MOB_PLANE
|
||||
layer = ABOVE_MOB_LAYER
|
||||
layer = BELOW_MOB_LAYER
|
||||
|
||||
var/list/network = list(NETWORK_DEFAULT)
|
||||
var/c_tag = null
|
||||
@@ -66,6 +66,8 @@
|
||||
var/area/A = get_area(src)
|
||||
c_tag = "[A ? A.name : "Unknown"] #[rand(111,999)]"
|
||||
..()
|
||||
if (dir == NORTH)
|
||||
layer = ABOVE_MOB_LAYER
|
||||
// VOREStation Edit End
|
||||
|
||||
/obj/machinery/camera/Destroy()
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
/obj/machinery/camera
|
||||
layer = BELOW_MOB_LAYER
|
||||
|
||||
/obj/machinery/camera/New()
|
||||
..()
|
||||
if (dir == NORTH)
|
||||
layer = ABOVE_MOB_LAYER
|
||||
@@ -129,8 +129,8 @@ var/global/list/engineering_networks = list(
|
||||
|
||||
// EMP
|
||||
|
||||
/obj/machinery/camera/emp_proof/New()
|
||||
..()
|
||||
/obj/machinery/camera/emp_proof/Initialize(mapload)
|
||||
. = ..()
|
||||
upgradeEmpProof()
|
||||
|
||||
// X-RAY
|
||||
@@ -150,14 +150,14 @@ var/global/list/engineering_networks = list(
|
||||
/obj/machinery/camera/xray/research
|
||||
network = list(NETWORK_RESEARCH)
|
||||
|
||||
/obj/machinery/camera/xray/New()
|
||||
..()
|
||||
/obj/machinery/camera/xray/Initialize(mapload)
|
||||
. = ..()
|
||||
upgradeXRay()
|
||||
|
||||
// MOTION
|
||||
|
||||
/obj/machinery/camera/motion/New()
|
||||
..()
|
||||
/obj/machinery/camera/motion/Initialize(mapload)
|
||||
. = ..()
|
||||
upgradeMotion()
|
||||
|
||||
/obj/machinery/camera/motion/engineering_outpost
|
||||
@@ -178,8 +178,8 @@ var/global/list/engineering_networks = list(
|
||||
/obj/machinery/camera/all/command
|
||||
network = list(NETWORK_COMMAND)
|
||||
|
||||
/obj/machinery/camera/all/New()
|
||||
..()
|
||||
/obj/machinery/camera/all/Initialize(mapload)
|
||||
. = ..()
|
||||
upgradeEmpProof()
|
||||
upgradeXRay()
|
||||
upgradeMotion()
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
)
|
||||
var/list/special_prizes = list() // Holds instanced objects, intended for admins to shove surprises inside or something.
|
||||
|
||||
/obj/machinery/computer/arcade/Initialize()
|
||||
/obj/machinery/computer/arcade/Initialize(mapload)
|
||||
. = ..()
|
||||
// If it's a generic arcade machine, pick a random arcade
|
||||
// circuit board for it and make the new machine
|
||||
@@ -351,8 +351,8 @@
|
||||
var/gameStatus = ORION_STATUS_START
|
||||
var/canContinueEvent = 0
|
||||
|
||||
/obj/machinery/computer/arcade/orion_trail/New()
|
||||
..()
|
||||
/obj/machinery/computer/arcade/orion_trail/Initialize(mapload)
|
||||
. = ..()
|
||||
// Sets up the main trail
|
||||
stops = list("Pluto","Asteroid Belt","Proxima Centauri","Dead Space","Rigel Prime","Tau Ceti Beta","Black Hole","Space Outpost Beta-9","Orion Prime")
|
||||
stopblurbs = list(
|
||||
@@ -1240,10 +1240,6 @@
|
||||
vendor_account.transaction_log.Add(T)
|
||||
|
||||
/// End Payment
|
||||
|
||||
/obj/machinery/computer/arcade/clawmachine/New()
|
||||
..()
|
||||
|
||||
/obj/machinery/computer/arcade/clawmachine/attack_hand(mob/living/user)
|
||||
if(..())
|
||||
return
|
||||
|
||||
@@ -12,8 +12,8 @@ var/global/list/minor_air_alarms = list()
|
||||
icon_screen = "alert:0"
|
||||
light_color = "#e6ffff"
|
||||
|
||||
/obj/machinery/computer/atmos_alert/New()
|
||||
..()
|
||||
/obj/machinery/computer/atmos_alert/Initialize(mapload)
|
||||
. = ..()
|
||||
atmosphere_alarm.register_alarm(src, /atom/proc/update_icon)
|
||||
|
||||
/obj/machinery/computer/atmos_alert/Destroy()
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
clicksound = "keyboard"
|
||||
|
||||
/obj/machinery/computer/Initialize()
|
||||
/obj/machinery/computer/Initialize(mapload)
|
||||
. = ..()
|
||||
power_change()
|
||||
update_icon()
|
||||
|
||||
@@ -101,8 +101,8 @@
|
||||
var/list/internal_log = list()
|
||||
var/mode = 0 // 0 - making pass, 1 - viewing logs
|
||||
|
||||
/obj/machinery/computer/guestpass/New()
|
||||
..()
|
||||
/obj/machinery/computer/guestpass/Initialize(mapload)
|
||||
. = ..()
|
||||
uid = "[rand(100,999)]-G[rand(10,99)]"
|
||||
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
circuit = /obj/item/circuitboard/shutoff_monitor
|
||||
var/datum/tgui_module/shutoff_monitor/monitor
|
||||
|
||||
/obj/machinery/computer/shutoff_monitor/New()
|
||||
..()
|
||||
/obj/machinery/computer/shutoff_monitor/Initialize(mapload)
|
||||
. = ..()
|
||||
monitor = new(src)
|
||||
|
||||
/obj/machinery/computer/shutoff_monitor/Destroy()
|
||||
@@ -24,4 +24,4 @@
|
||||
if(!(stat & (NOPOWER|BROKEN)))
|
||||
add_overlay("ai-fixer-empty")
|
||||
else
|
||||
cut_overlay("ai-fixer-empty")
|
||||
cut_overlay("ai-fixer-empty")
|
||||
|
||||
@@ -9,14 +9,10 @@
|
||||
var/air_frequency = 1437
|
||||
autoclose = 0
|
||||
|
||||
/obj/machinery/door/airlock/alarmlock/New()
|
||||
..()
|
||||
air_connection = new
|
||||
|
||||
/obj/machinery/door/airlock/alarmlock/Destroy()
|
||||
if(radio_controller)
|
||||
radio_controller.remove_object(src,air_frequency)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/machinery/door/airlock/alarmlock/Initialize()
|
||||
. = ..()
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
visible_message(span_infoplain(span_bold("\The [user]") + " bonks \the [src] harmlessly."))
|
||||
user.do_attack_animation(src)
|
||||
|
||||
/obj/machinery/door/New()
|
||||
/obj/machinery/door/Initialize(mapload)
|
||||
. = ..()
|
||||
if(density)
|
||||
layer = closed_layer
|
||||
@@ -73,7 +73,6 @@
|
||||
update_icon()
|
||||
|
||||
update_nearby_tiles(need_rebuild=1)
|
||||
return
|
||||
|
||||
/obj/machinery/door/Destroy()
|
||||
density = FALSE
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
var/obj/item/stack/tile/T
|
||||
var/list/mode = list("dismantle"=0,"laying"=0,"collect"=0)
|
||||
|
||||
/obj/machinery/floorlayer/New()
|
||||
/obj/machinery/floorlayer/Initialize(mapload)
|
||||
. = ..()
|
||||
T = new/obj/item/stack/tile/floor(src)
|
||||
..()
|
||||
|
||||
/obj/machinery/floorlayer/Moved(atom/old_loc, direction, forced = FALSE)
|
||||
. = ..()
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
var/datum/looping_sound/tcomms/soundloop // CHOMPStation Add: Hummy noises
|
||||
var/noisy = TRUE // CHOMPStation Add: Hummy noises
|
||||
|
||||
/obj/machinery/pda_multicaster/New()
|
||||
..()
|
||||
/obj/machinery/pda_multicaster/Initialize(mapload)
|
||||
. = ..()
|
||||
internal_PDAs = list("command" = new /obj/item/pda/multicaster/command(src),
|
||||
"security" = new /obj/item/pda/multicaster/security(src),
|
||||
"engineering" = new /obj/item/pda/multicaster/engineering(src),
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
clicksound = "switch"
|
||||
interact_offline = TRUE
|
||||
|
||||
/obj/machinery/space_heater/Initialize() //ChompEDIT New --> Initialize
|
||||
..()
|
||||
/obj/machinery/space_heater/Initialize(mapload)
|
||||
. = ..()
|
||||
if(cell_type)
|
||||
cell = new cell_type(src)
|
||||
update_icon()
|
||||
|
||||
@@ -36,12 +36,11 @@
|
||||
icon_scale_y = 1.5
|
||||
|
||||
/*
|
||||
/obj/mecha/combat/durand/New()
|
||||
..()
|
||||
/obj/mecha/combat/durand/Initialize(mapload)
|
||||
. = ..()
|
||||
weapons += new /datum/mecha_weapon/ballistic/lmg(src)
|
||||
weapons += new /datum/mecha_weapon/ballistic/scattershot(src)
|
||||
selected_weapon = weapons[1]
|
||||
return
|
||||
*/
|
||||
|
||||
|
||||
@@ -80,8 +79,8 @@
|
||||
/obj/mecha/combat/durand/old
|
||||
desc = "An aging combat exosuit utilized by many corporations. Originally developed to combat hostile alien lifeforms. This one is particularly worn looking and likely isn't as sturdy."
|
||||
|
||||
/obj/mecha/combat/durand/old/New()
|
||||
..()
|
||||
/obj/mecha/combat/durand/old/Initialize(mapload)
|
||||
. = ..()
|
||||
health = 25
|
||||
maxhealth = 250 //Just slightly worse.
|
||||
cell.charge = rand(0, (cell.charge/2))
|
||||
|
||||
@@ -112,10 +112,9 @@
|
||||
|
||||
var/obj/item/clothing/glasses/hud/health/mech/hud
|
||||
|
||||
/obj/mecha/combat/gygax/serenity/New()
|
||||
..()
|
||||
/obj/mecha/combat/gygax/serenity/Initialize(mapload)
|
||||
. = ..()
|
||||
hud = new /obj/item/clothing/glasses/hud/health/mech(src)
|
||||
return
|
||||
|
||||
/obj/mecha/combat/gygax/serenity/moved_inside(var/mob/living/carbon/human/H as mob)
|
||||
if(..())
|
||||
@@ -141,8 +140,8 @@
|
||||
/obj/mecha/combat/gygax/old
|
||||
desc = "A lightweight, security exosuit. Popular among private and corporate security. This one is particularly worn looking and likely isn't as sturdy."
|
||||
|
||||
/obj/mecha/combat/gygax/old/New()
|
||||
..()
|
||||
/obj/mecha/combat/gygax/old/Initialize(mapload)
|
||||
. = ..()
|
||||
health = 25
|
||||
maxhealth = 250 //Just slightly worse.
|
||||
cell.charge = rand(0, (cell.charge/2))
|
||||
|
||||
@@ -143,8 +143,8 @@
|
||||
|
||||
starting_equipment = null
|
||||
|
||||
/obj/mecha/combat/marauder/old/New()
|
||||
..()
|
||||
/obj/mecha/combat/marauder/old/Initialize(mapload)
|
||||
. = ..()
|
||||
health = 25
|
||||
maxhealth = 300 //Just slightly worse.
|
||||
cell.charge = rand(0, (cell.charge/2))
|
||||
|
||||
@@ -161,8 +161,8 @@
|
||||
/obj/mecha/combat/phazon/old
|
||||
desc = "An exosuit which can only be described as 'WTF?'. This one is particularly worn looking and likely isn't as sturdy."
|
||||
|
||||
/obj/mecha/combat/phazon/old/New()
|
||||
..()
|
||||
/obj/mecha/combat/phazon/old/Initialize(mapload)
|
||||
. = ..()
|
||||
health = 25
|
||||
maxhealth = 150 //Just slightly worse.
|
||||
cell.charge = rand(0, (cell.charge/2))
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
var/max_cable = 1000
|
||||
required_type = list(/obj/mecha/working)
|
||||
|
||||
/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/New()
|
||||
/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/Initialize(mapload)
|
||||
. = ..()
|
||||
cable = new(src, 0)
|
||||
..()
|
||||
|
||||
/obj/item/mecha_parts/mecha_equipment/tool/cable_layer/MoveAction()
|
||||
layCable()
|
||||
|
||||
@@ -15,12 +15,11 @@
|
||||
|
||||
equip_type = EQUIP_HULL
|
||||
|
||||
/obj/item/mecha_parts/mecha_equipment/combat_shield/New()
|
||||
..()
|
||||
/obj/item/mecha_parts/mecha_equipment/combat_shield/Initialize(mapload)
|
||||
. = ..()
|
||||
my_shield = new my_shield_type
|
||||
my_shield.shield_regen_delay = equip_cooldown
|
||||
my_shield.my_tool = src
|
||||
return
|
||||
|
||||
/obj/item/mecha_parts/mecha_equipment/combat_shield/critfail()
|
||||
..()
|
||||
|
||||
@@ -175,7 +175,7 @@
|
||||
|
||||
var/weapons_only_cycle = FALSE //So combat mechs don't switch to their equipment at times.
|
||||
|
||||
/obj/mecha/Initialize()
|
||||
/obj/mecha/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
for(var/path in starting_components)
|
||||
@@ -191,18 +191,6 @@
|
||||
|
||||
update_transform()
|
||||
|
||||
/obj/mecha/drain_power(var/drain_check)
|
||||
|
||||
if(drain_check)
|
||||
return 1
|
||||
|
||||
if(!cell)
|
||||
return 0
|
||||
|
||||
return cell.drain_power(drain_check)
|
||||
|
||||
/obj/mecha/New()
|
||||
..()
|
||||
icon_state += "-open"
|
||||
add_radio()
|
||||
add_cabin()
|
||||
@@ -222,7 +210,16 @@
|
||||
log_message("[src.name] created.")
|
||||
loc.Entered(src)
|
||||
mechas_list += src //global mech list
|
||||
return
|
||||
|
||||
/obj/mecha/drain_power(var/drain_check)
|
||||
|
||||
if(drain_check)
|
||||
return 1
|
||||
|
||||
if(!cell)
|
||||
return 0
|
||||
|
||||
return cell.drain_power(drain_check)
|
||||
|
||||
/obj/mecha/Exit(atom/movable/O)
|
||||
if(O in cargo)
|
||||
|
||||
@@ -125,7 +125,7 @@
|
||||
|
||||
C.images += holder
|
||||
*/
|
||||
/obj/mecha/medical/odysseus/loaded/Initialize()
|
||||
/obj/mecha/medical/odysseus/loaded/Initialize(mapload)
|
||||
. = ..()
|
||||
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/sleeper
|
||||
ME.attach(src)
|
||||
@@ -138,8 +138,8 @@
|
||||
/obj/mecha/medical/odysseus/old
|
||||
desc = "An aging combat exosuit utilized by many corporations. Originally developed to combat hostile alien lifeforms. This one is particularly worn looking and likely isn't as sturdy."
|
||||
|
||||
/obj/mecha/medical/odysseus/old/New()
|
||||
..()
|
||||
/obj/mecha/medical/odysseus/old/Initialize(mapload)
|
||||
. = ..()
|
||||
health = 25
|
||||
maxhealth = 50 //Just slightly worse.
|
||||
cell.charge = rand(0, (cell.charge/2))
|
||||
|
||||
@@ -25,8 +25,8 @@
|
||||
name = "Gopher Chassis"
|
||||
icon_state = "gopher-chassis"
|
||||
|
||||
/obj/item/mecha_parts/micro/chassis/gopher/New()
|
||||
..()
|
||||
/obj/item/mecha_parts/micro/chassis/gopher/Initialize(mapload)
|
||||
. = ..()
|
||||
construct = new /datum/construction/mecha/gopher_chassis(src)
|
||||
|
||||
/obj/item/mecha_parts/micro/part/gopher_torso
|
||||
@@ -64,8 +64,8 @@
|
||||
name = "Polecat Chassis"
|
||||
icon_state = "polecat-chassis"
|
||||
|
||||
/obj/item/mecha_parts/micro/chassis/polecat/New()
|
||||
..()
|
||||
/obj/item/mecha_parts/micro/chassis/polecat/Initialize(mapload)
|
||||
. = ..()
|
||||
construct = new /datum/construction/mecha/polecat_chassis(src)
|
||||
|
||||
/obj/item/mecha_parts/micro/part/polecat_torso
|
||||
@@ -103,8 +103,8 @@
|
||||
name = "Weasel Chassis"
|
||||
icon_state = "weasel-chassis"
|
||||
|
||||
/obj/item/mecha_parts/micro/chassis/weasel/New()
|
||||
..()
|
||||
/obj/item/mecha_parts/micro/chassis/weasel/Initialize(mapload)
|
||||
. = ..()
|
||||
construct = new /datum/construction/mecha/weasel_chassis(src)
|
||||
|
||||
/obj/item/mecha_parts/micro/part/weasel_torso
|
||||
@@ -140,4 +140,4 @@
|
||||
/obj/item/mecha_parts/micro/part/weasel_tri_leg
|
||||
name="Weasel Legs"
|
||||
icon_state = "weasel-leg-all"
|
||||
origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) */
|
||||
origin_tech = list(TECH_DATA = 2, TECH_MATERIAL = 3, TECH_ENGINEERING = 3) */
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
max_universal_equip = 1
|
||||
max_special_equip = 1
|
||||
|
||||
/obj/mecha/working/ripley/deathripley/Initialize()
|
||||
/obj/mecha/working/ripley/deathripley/Initialize(mapload)
|
||||
. = ..()
|
||||
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp/safety
|
||||
ME.attach(src)
|
||||
@@ -92,7 +92,7 @@
|
||||
desc = "An old, dusty mining ripley."
|
||||
name = "APLU \"Miner\""
|
||||
|
||||
/obj/mecha/working/ripley/mining/Initialize()
|
||||
/obj/mecha/working/ripley/mining/Initialize(mapload)
|
||||
. = ..()
|
||||
//Attach drill
|
||||
if(prob(25)) //Possible diamond drill... Feeling lucky?
|
||||
@@ -125,7 +125,7 @@
|
||||
|
||||
//Vorestation Edit Start
|
||||
|
||||
/obj/mecha/working/ripley/Initialize()
|
||||
/obj/mecha/working/ripley/Initialize(mapload)
|
||||
. = ..()
|
||||
orescanner = new /obj/item/mining_scanner
|
||||
|
||||
@@ -143,8 +143,8 @@
|
||||
/obj/mecha/working/ripley/mining/old
|
||||
desc = "An old, dusty mining ripley."
|
||||
|
||||
/obj/mecha/working/ripley/mining/old/New()
|
||||
..()
|
||||
/obj/mecha/working/ripley/mining/old/Initialize(mapload)
|
||||
. = ..()
|
||||
health = 25
|
||||
maxhealth = 190 //Just slightly worse.
|
||||
cell.charge = rand(0, cell.charge)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
|
||||
GLOBAL_LIST_EMPTY(bump_teleporters)
|
||||
|
||||
/obj/effect/bump_teleporter
|
||||
name = "bump-teleporter"
|
||||
@@ -11,12 +11,12 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
|
||||
density = TRUE
|
||||
opacity = 0
|
||||
|
||||
/obj/effect/bump_teleporter/New()
|
||||
..()
|
||||
BUMP_TELEPORTERS += src
|
||||
/obj/effect/bump_teleporter/Initialize()
|
||||
. = ..()
|
||||
GLOB.bump_teleporters += src
|
||||
|
||||
/obj/effect/bump_teleporter/Destroy()
|
||||
BUMP_TELEPORTERS -= src
|
||||
GLOB.bump_teleporters -= src
|
||||
return ..()
|
||||
|
||||
/obj/effect/bump_teleporter/Bumped(atom/user)
|
||||
@@ -28,7 +28,7 @@ var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
|
||||
//user.loc = src.loc //Stop at teleporter location, there is nowhere to teleport to.
|
||||
return
|
||||
|
||||
for(var/obj/effect/bump_teleporter/BT in BUMP_TELEPORTERS)
|
||||
for(var/obj/effect/bump_teleporter/BT in GLOB.bump_teleporters)
|
||||
if(BT.id == src.id_target)
|
||||
M.forceMove(BT.loc) //Teleport to location with correct id. //VOREStation Edit
|
||||
return
|
||||
|
||||
@@ -6,10 +6,9 @@
|
||||
anchored = TRUE
|
||||
mouse_opacity = 0
|
||||
|
||||
/obj/effect/expl_particles/New()
|
||||
..()
|
||||
spawn (15)
|
||||
qdel(src)
|
||||
/obj/effect/expl_particles/Initialize()
|
||||
. = ..()
|
||||
QDEL_IN(src, 1.5 SECONDS)
|
||||
return
|
||||
|
||||
/datum/effect/system/expl_particles
|
||||
@@ -42,10 +41,9 @@
|
||||
pixel_x = -32
|
||||
pixel_y = -32
|
||||
|
||||
/obj/effect/explosion/New()
|
||||
..()
|
||||
spawn (10)
|
||||
qdel(src)
|
||||
/obj/effect/explosion/Initialize()
|
||||
. = ..()
|
||||
QDEL_IN(src, 1 SECOND)
|
||||
return
|
||||
|
||||
/datum/effect/system/explosion
|
||||
@@ -60,13 +58,17 @@
|
||||
var/datum/effect/system/expl_particles/P = new/datum/effect/system/expl_particles()
|
||||
P.set_up(10,location)
|
||||
P.start()
|
||||
spawn(5)
|
||||
var/datum/effect/effect/system/smoke_spread/S = new/datum/effect/effect/system/smoke_spread()
|
||||
S.set_up(5,0,location,null)
|
||||
S.start()
|
||||
addtimer(CALLBACK(src, PROC_REF(spread_smoke)), 0.5 SECONDS)
|
||||
|
||||
/datum/effect/system/explosion/proc/spread_smoke()
|
||||
PRIVATE_PROC(TRUE)
|
||||
SHOULD_NOT_OVERRIDE(TRUE)
|
||||
var/datum/effect/effect/system/smoke_spread/S = new/datum/effect/effect/system/smoke_spread()
|
||||
S.set_up(5,0,location,null)
|
||||
S.start()
|
||||
|
||||
/datum/effect/system/explosion/smokeless/start()
|
||||
new/obj/effect/explosion(location)
|
||||
var/datum/effect/system/expl_particles/P = new/datum/effect/system/expl_particles()
|
||||
P.set_up(10,location)
|
||||
P.start()
|
||||
P.start()
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
icon_state = "x"
|
||||
unacidable = TRUE//Just to be sure.
|
||||
|
||||
/obj/effect/manifest/New()
|
||||
/obj/effect/manifest/Initialize()
|
||||
. = ..()
|
||||
|
||||
src.invisibility = 101
|
||||
return
|
||||
invisibility = 101
|
||||
|
||||
/obj/effect/manifest/proc/manifest()
|
||||
var/dat = span_bold("Crew Manifest") + ":<BR>"
|
||||
|
||||
@@ -173,7 +173,7 @@ GLOBAL_LIST_EMPTY(mapped_autostrips_mob)
|
||||
|
||||
/obj/effect/step_trigger/teleporter/landmark/Initialize()
|
||||
. = ..()
|
||||
for(var/obj/effect/landmark/teleport_mark/mark in tele_landmarks)
|
||||
for(var/obj/effect/landmark/teleport_mark/mark in GLOB.tele_landmarks)
|
||||
if(mark.landmark_id == landmark_id)
|
||||
the_landmark = mark
|
||||
return
|
||||
@@ -183,17 +183,17 @@ GLOBAL_LIST_EMPTY(mapped_autostrips_mob)
|
||||
A.forceMove(get_turf(the_landmark))
|
||||
|
||||
|
||||
var/global/list/tele_landmarks = list() // Terrible, but the alternative is looping through world.
|
||||
GLOBAL_LIST_EMPTY(tele_landmarks)
|
||||
|
||||
/obj/effect/landmark/teleport_mark
|
||||
var/landmark_id = null
|
||||
|
||||
/obj/effect/landmark/teleport_mark/New()
|
||||
..()
|
||||
tele_landmarks += src
|
||||
/obj/effect/landmark/teleport_mark/Initialize()
|
||||
. = ..()
|
||||
GLOB.tele_landmarks += src
|
||||
|
||||
/obj/effect/landmark/teleport_mark/Destroy()
|
||||
tele_landmarks -= src
|
||||
GLOB.tele_landmarks -= src
|
||||
return ..()
|
||||
|
||||
/* Teleporter which simulates falling out of the sky. */
|
||||
|
||||
@@ -13,17 +13,17 @@
|
||||
slot_flags = SLOT_BACK
|
||||
|
||||
//Predefined materials go here.
|
||||
/obj/item/material/twohanded/baseballbat/metal/New(var/newloc)
|
||||
..(newloc,MAT_STEEL)
|
||||
/obj/item/material/twohanded/baseballbat/metal/Initialize(mapload)
|
||||
. = ..(mapload,MAT_STEEL)
|
||||
|
||||
/obj/item/material/twohanded/baseballbat/uranium/New(var/newloc)
|
||||
..(newloc,MAT_URANIUM)
|
||||
/obj/item/material/twohanded/baseballbat/uranium/Initialize(mapload)
|
||||
. = ..(mapload,MAT_URANIUM)
|
||||
|
||||
/obj/item/material/twohanded/baseballbat/gold/New(var/newloc)
|
||||
..(newloc,MAT_GOLD)
|
||||
/obj/item/material/twohanded/baseballbat/gold/Initialize(mapload)
|
||||
. = ..(mapload,MAT_GOLD)
|
||||
|
||||
/obj/item/material/twohanded/baseballbat/platinum/New(var/newloc)
|
||||
..(newloc,MAT_PLATINUM)
|
||||
/obj/item/material/twohanded/baseballbat/platinum/Initialize(mapload)
|
||||
. = ..(mapload,MAT_PLATINUM)
|
||||
|
||||
/obj/item/material/twohanded/baseballbat/diamond/New(var/newloc)
|
||||
..(newloc,MAT_DIAMOND)
|
||||
/obj/item/material/twohanded/baseballbat/diamond/Initialize(mapload)
|
||||
. = ..(mapload,MAT_DIAMOND)
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
|
||||
var/list/spawned_mobs = list()
|
||||
|
||||
/obj/structure/mob_spawner/New()
|
||||
..()
|
||||
/obj/structure/mob_spawner/Initialize(mapload)
|
||||
. = ..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
last_spawn = world.time + rand(0,spawn_delay)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user