mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 19:47:47 +01:00
more new to Init (#17147)
* more new to Init * fix pumps * style update * fix atmos memory leak * fix mech * qdel in here * Update hands.dm * Update rings.dm
This commit is contained in:
@@ -64,6 +64,9 @@
|
||||
#define MAT_CARDBOARD "cardboard"
|
||||
#define MAT_COTTON "cotton"
|
||||
#define MAT_GLAMOUR "stable glamour"
|
||||
#define MAT_DARKGLASS "darkglass"
|
||||
#define MAT_FLESH "flesh"
|
||||
#define MAT_FANCYBLACK "fancyblack"
|
||||
|
||||
// cloth materials
|
||||
#define MAT_WOOL "wool"
|
||||
|
||||
@@ -12,10 +12,11 @@
|
||||
|
||||
var/mob/my_mob = null // The mob that possesses this hud object.
|
||||
|
||||
/obj/screen/movable/ability_master/New(owner)
|
||||
if(owner)
|
||||
my_mob = owner
|
||||
update_abilities(0, owner)
|
||||
/obj/screen/movable/ability_master/Initialize(mapload)
|
||||
. = ..()
|
||||
if(ismob(loc))
|
||||
my_mob = loc
|
||||
update_abilities(0, loc)
|
||||
overlays.Add(closed_state)
|
||||
else
|
||||
message_admins("ERROR: ability_master's New() was not given an owner argument. This is a bug.")
|
||||
@@ -179,8 +180,8 @@
|
||||
ability_master.toggle_open(1)
|
||||
client.screen -= ability_master
|
||||
|
||||
/mob/New()
|
||||
..()
|
||||
/mob/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!ability_master) //VOREStation Edit: S H A D E K I N
|
||||
ability_master = new /obj/screen/movable/ability_master(src)
|
||||
|
||||
|
||||
@@ -864,8 +864,8 @@
|
||||
mouse_opacity = 0
|
||||
var/obj/screen/movable/mapper_holder/parent
|
||||
|
||||
/obj/screen/mapper/New()
|
||||
..()
|
||||
/obj/screen/mapper/Initialize(mapload)
|
||||
. = ..()
|
||||
parent = loc
|
||||
|
||||
/obj/screen/mapper/Destroy()
|
||||
|
||||
@@ -7,8 +7,9 @@
|
||||
blocks_emissive = FALSE
|
||||
var/target
|
||||
|
||||
/obj/effect/statclick/New(loc, text, target) //Don't port this to Initialize it's too critical
|
||||
..()
|
||||
INITIALIZE_IMMEDIATE(/obj/effect/statclick)
|
||||
/obj/effect/statclick/Initialize(mapload, text, target)
|
||||
. = ..()
|
||||
name = text
|
||||
src.target = target
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -384,34 +384,30 @@ update_flag
|
||||
add_fingerprint(ui.user)
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/portable_atmospherics/canister/phoron/New()
|
||||
..()
|
||||
/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/New()
|
||||
..()
|
||||
/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/New()
|
||||
..()
|
||||
/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/New()
|
||||
..()
|
||||
/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()
|
||||
@@ -421,51 +417,43 @@ update_flag
|
||||
if (istype(src.loc))
|
||||
location.assume_air(air_contents)
|
||||
air_contents = new
|
||||
return 1
|
||||
|
||||
/obj/machinery/portable_atmospherics/canister/nitrogen/New()
|
||||
/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/New()
|
||||
..()
|
||||
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/New()
|
||||
..()
|
||||
/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/New()
|
||||
..()
|
||||
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/New()
|
||||
..()
|
||||
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/New()
|
||||
..()
|
||||
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()
|
||||
/obj/machinery/portable_atmospherics/Initialize(mapload)
|
||||
..()
|
||||
//VOREStation Edit - Fix runtime
|
||||
if(air_contents)
|
||||
air_contents.volume = volume
|
||||
air_contents.temperature = T20C
|
||||
//VOREStation Edit End
|
||||
|
||||
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
|
||||
@@ -112,8 +112,8 @@ var/global/list/engineering_networks = list(
|
||||
|
||||
// EMP
|
||||
|
||||
/obj/machinery/camera/emp_proof/New()
|
||||
..()
|
||||
/obj/machinery/camera/emp_proof/Initialize(mapload)
|
||||
. = ..()
|
||||
upgradeEmpProof()
|
||||
|
||||
// X-RAY
|
||||
@@ -133,14 +133,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
|
||||
@@ -155,8 +155,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)
|
||||
. = ..()
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
var/toggle = 1 // If we /should/ be active or not,
|
||||
var/list/internal_PDAs = list() // Assoc list of PDAs inside of this, with the department name being the index,
|
||||
|
||||
/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/New()
|
||||
..()
|
||||
/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))
|
||||
|
||||
@@ -160,8 +160,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()
|
||||
..()
|
||||
|
||||
+11
-14
@@ -173,7 +173,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)
|
||||
@@ -189,18 +189,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()
|
||||
@@ -220,7 +208,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>"
|
||||
|
||||
@@ -175,7 +175,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
|
||||
@@ -185,17 +185,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)
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
var/datum/say_list/say_list = null
|
||||
var/say_list_type = /datum/say_list // Type to give us on initialization. Default has empty lists, so the mob will be silent.
|
||||
|
||||
/mob/living/Initialize()
|
||||
/mob/living/Initialize(mapload)
|
||||
if(say_list_type)
|
||||
say_list = new say_list_type(src)
|
||||
return ..()
|
||||
|
||||
@@ -52,8 +52,8 @@
|
||||
/obj/item/clothing/accessory/bracelet/material
|
||||
icon_state = "materialbracelet"
|
||||
|
||||
/obj/item/clothing/accessory/bracelet/material/New(var/newloc, var/new_material)
|
||||
..(newloc)
|
||||
/obj/item/clothing/accessory/bracelet/material/Initialize(mapload, var/new_material)
|
||||
. = ..()
|
||||
if(!new_material)
|
||||
new_material = MAT_STEEL
|
||||
material = get_material_by_name(new_material)
|
||||
@@ -67,32 +67,32 @@
|
||||
/obj/item/clothing/accessory/bracelet/material/get_material()
|
||||
return material
|
||||
|
||||
/obj/item/clothing/accessory/bracelet/material/wood/New(var/newloc)
|
||||
..(newloc, MAT_WOOD)
|
||||
/obj/item/clothing/accessory/bracelet/material/wood/Initialize(mapload)
|
||||
. = ..(mapload, MAT_WOOD)
|
||||
|
||||
/obj/item/clothing/accessory/bracelet/material/plastic/New(var/newloc)
|
||||
..(newloc, MAT_PLASTIC)
|
||||
/obj/item/clothing/accessory/bracelet/material/plastic/Initialize(mapload)
|
||||
. = ..(mapload, MAT_PLASTIC)
|
||||
|
||||
/obj/item/clothing/accessory/bracelet/material/iron/New(var/newloc)
|
||||
..(newloc, MAT_IRON)
|
||||
/obj/item/clothing/accessory/bracelet/material/iron/Initialize(mapload)
|
||||
. = ..(mapload, MAT_IRON)
|
||||
|
||||
/obj/item/clothing/accessory/bracelet/material/steel/New(var/newloc)
|
||||
..(newloc, MAT_STEEL)
|
||||
/obj/item/clothing/accessory/bracelet/material/steel/Initialize(mapload)
|
||||
. = ..(mapload, MAT_STEEL)
|
||||
|
||||
/obj/item/clothing/accessory/bracelet/material/silver/New(var/newloc)
|
||||
..(newloc, MAT_SILVER)
|
||||
/obj/item/clothing/accessory/bracelet/material/silver/Initialize(mapload)
|
||||
. = ..(mapload, MAT_SILVER)
|
||||
|
||||
/obj/item/clothing/accessory/bracelet/material/gold/New(var/newloc)
|
||||
..(newloc, MAT_GOLD)
|
||||
/obj/item/clothing/accessory/bracelet/material/gold/Initialize(mapload)
|
||||
. = ..(mapload, MAT_GOLD)
|
||||
|
||||
/obj/item/clothing/accessory/bracelet/material/platinum/New(var/newloc)
|
||||
..(newloc, MAT_PLATINUM)
|
||||
/obj/item/clothing/accessory/bracelet/material/platinum/Initialize(mapload)
|
||||
. = ..(mapload, MAT_PLATINUM)
|
||||
|
||||
/obj/item/clothing/accessory/bracelet/material/phoron/New(var/newloc)
|
||||
..(newloc, MAT_PHORON)
|
||||
/obj/item/clothing/accessory/bracelet/material/phoron/Initialize(mapload)
|
||||
. = ..(mapload, MAT_PHORON)
|
||||
|
||||
/obj/item/clothing/accessory/bracelet/material/glass/New(var/newloc)
|
||||
..(newloc, MAT_GLASS)
|
||||
/obj/item/clothing/accessory/bracelet/material/glass/Initialize(mapload)
|
||||
. = ..(mapload, MAT_GLASS)
|
||||
|
||||
//wristbands
|
||||
|
||||
|
||||
@@ -137,14 +137,13 @@
|
||||
icon = 'icons/inventory/hands/item.dmi'
|
||||
icon_state = "material"
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/New(var/newloc, var/new_material)
|
||||
..(newloc)
|
||||
/obj/item/clothing/accessory/ring/material/Initialize(mapload, var/new_material)
|
||||
. = ..()
|
||||
if(!new_material)
|
||||
new_material = MAT_STEEL
|
||||
material = get_material_by_name(new_material)
|
||||
if(!istype(material))
|
||||
qdel(src)
|
||||
return
|
||||
return INITIALIZE_HINT_QDEL
|
||||
name = "[material.display_name] ring"
|
||||
desc = "A ring made from [material.display_name]."
|
||||
color = material.icon_colour
|
||||
@@ -152,56 +151,56 @@
|
||||
/obj/item/clothing/accessory/ring/material/get_material()
|
||||
return material
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/wood/New(var/newloc)
|
||||
..(newloc, MAT_WOOD)
|
||||
/obj/item/clothing/accessory/ring/material/wood/Initialize(mapload)
|
||||
. = ..(mapload, MAT_WOOD)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/plastic/New(var/newloc)
|
||||
..(newloc, MAT_PLASTIC)
|
||||
/obj/item/clothing/accessory/ring/material/plastic/Initialize(mapload)
|
||||
. = ..(mapload, MAT_PLASTIC)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/iron/New(var/newloc)
|
||||
..(newloc, MAT_IRON)
|
||||
/obj/item/clothing/accessory/ring/material/iron/Initialize(mapload)
|
||||
. = ..(mapload, MAT_IRON)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/glass/New(var/newloc)
|
||||
..(newloc, MAT_GLASS)
|
||||
/obj/item/clothing/accessory/ring/material/glass/Initialize(mapload)
|
||||
. = ..(mapload, MAT_GLASS)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/steel/New(var/newloc)
|
||||
..(newloc, MAT_STEEL)
|
||||
/obj/item/clothing/accessory/ring/material/steel/Initialize(mapload)
|
||||
. = ..(mapload, MAT_STEEL)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/silver/New(var/newloc)
|
||||
..(newloc, MAT_SILVER)
|
||||
/obj/item/clothing/accessory/ring/material/silver/Initialize(mapload)
|
||||
. = ..(mapload, MAT_SILVER)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/gold/New(var/newloc)
|
||||
..(newloc, MAT_GOLD)
|
||||
/obj/item/clothing/accessory/ring/material/gold/Initialize(mapload)
|
||||
. = ..(mapload, MAT_GOLD)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/platinum/New(var/newloc)
|
||||
..(newloc, MAT_PLATINUM)
|
||||
/obj/item/clothing/accessory/ring/material/platinum/Initialize(mapload)
|
||||
. = ..(mapload, MAT_PLATINUM)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/phoron/New(var/newloc)
|
||||
..(newloc, MAT_PHORON)
|
||||
/obj/item/clothing/accessory/ring/material/phoron/Initialize(mapload)
|
||||
. = ..(mapload, MAT_PHORON)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/titanium/New(var/newloc)
|
||||
..(newloc, MAT_TITANIUM)
|
||||
/obj/item/clothing/accessory/ring/material/titanium/Initialize(mapload)
|
||||
. = ..(mapload, MAT_TITANIUM)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/copper/New(var/newloc)
|
||||
..(newloc, MAT_COPPER)
|
||||
/obj/item/clothing/accessory/ring/material/copper/Initialize(mapload)
|
||||
. = ..(mapload, MAT_COPPER)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/bronze/New(var/newloc)
|
||||
..(newloc, MAT_BRONZE)
|
||||
/obj/item/clothing/accessory/ring/material/bronze/Initialize(mapload)
|
||||
. = ..(mapload, MAT_BRONZE)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/uranium/New(var/newloc)
|
||||
..(newloc, MAT_URANIUM)
|
||||
/obj/item/clothing/accessory/ring/material/uranium/Initialize(mapload)
|
||||
. = ..(mapload, MAT_URANIUM)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/osmium/New(var/newloc)
|
||||
..(newloc, MAT_OSMIUM)
|
||||
/obj/item/clothing/accessory/ring/material/osmium/Initialize(mapload)
|
||||
. = ..(mapload, MAT_OSMIUM)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/lead/New(var/newloc)
|
||||
..(newloc, MAT_LEAD)
|
||||
/obj/item/clothing/accessory/ring/material/lead/Initialize(mapload)
|
||||
. = ..(mapload, MAT_LEAD)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/diamond/New(var/newloc)
|
||||
..(newloc, MAT_DIAMOND)
|
||||
/obj/item/clothing/accessory/ring/material/diamond/Initialize(mapload)
|
||||
. = ..(mapload, MAT_DIAMOND)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/tin/New(var/newloc)
|
||||
..(newloc, MAT_TIN)
|
||||
/obj/item/clothing/accessory/ring/material/tin/Initialize(mapload)
|
||||
. = ..(mapload, MAT_TIN)
|
||||
|
||||
/obj/item/clothing/accessory/ring/material/void_opal/New(var/newloc)
|
||||
..(newloc, MAT_VOPAL)
|
||||
/obj/item/clothing/accessory/ring/material/void_opal/Initialize(mapload)
|
||||
. = ..(mapload, MAT_VOPAL)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/datum/material/flesh
|
||||
name = "flesh"
|
||||
display_name = "chunk of flesh"
|
||||
name = MAT_FLESH
|
||||
display_name = "chunk of " + MAT_FLESH
|
||||
icon_colour = "#dd90aa"
|
||||
sheet_singular_name = "meat"
|
||||
sheet_plural_name = "meats"
|
||||
@@ -20,15 +20,15 @@
|
||||
weight = 20 //Strong as iron.
|
||||
|
||||
/datum/material/darkglass
|
||||
name = "darkglass"
|
||||
display_name = "darkglass"
|
||||
icon_base = "darkglass"
|
||||
table_icon_base = "darkglass"
|
||||
name = MAT_DARKGLASS
|
||||
display_name = MAT_DARKGLASS
|
||||
icon_base = MAT_DARKGLASS
|
||||
table_icon_base = MAT_DARKGLASS
|
||||
icon_colour = "#FFFFFF"
|
||||
|
||||
/datum/material/fancyblack
|
||||
name = "fancyblack"
|
||||
display_name = "fancyblack"
|
||||
icon_base = "fancyblack"
|
||||
table_icon_base = "fancyblack"
|
||||
name = MAT_FANCYBLACK
|
||||
display_name = MAT_FANCYBLACK
|
||||
icon_base = MAT_FANCYBLACK
|
||||
table_icon_base = MAT_FANCYBLACK
|
||||
icon_colour = "#FFFFFF"
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
updateVisibility(src)
|
||||
return ..()
|
||||
|
||||
/obj/effect/Initialize()
|
||||
/obj/effect/Initialize(mapload)
|
||||
. = ..()
|
||||
updateVisibility(src)
|
||||
|
||||
@@ -56,4 +56,4 @@
|
||||
// Glass door glass = 1
|
||||
// don't check then?
|
||||
if(!glass)
|
||||
updateVisibility(src, 0)
|
||||
updateVisibility(src, 0)
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
mecha = null//This does not appear to be used outside of reference in mecha.dm.
|
||||
|
||||
|
||||
/obj/item/mmi/digital/posibrain/attack_self(mob/user as mob)
|
||||
/obj/item/mmi/digital/posibrain/attack_self(mob/user)
|
||||
if(brainmob && !brainmob.key && searching == 0)
|
||||
//Start the process of searching for a new user.
|
||||
to_chat(user, span_blue("You carefully locate the manual activation switch and start the positronic brain's boot process."))
|
||||
icon_state = "posibrain-searching"
|
||||
src.searching = 1
|
||||
src.request_player()
|
||||
spawn(600) reset_search()
|
||||
searching = 1
|
||||
request_player()
|
||||
addtimer(CALLBACK(src, PROC_REF(reset_search)), 60 SECONDS, TIMER_DELETE_ME)
|
||||
|
||||
/obj/item/mmi/digital/posibrain/proc/request_player()
|
||||
for(var/mob/observer/dead/O in player_list)
|
||||
@@ -100,7 +100,7 @@
|
||||
src.brainmob.emp_damage += rand(0,5)
|
||||
..()
|
||||
|
||||
/obj/item/mmi/digital/posibrain/New()
|
||||
..()
|
||||
src.brainmob.name = "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]"
|
||||
src.brainmob.real_name = src.brainmob.name
|
||||
/obj/item/mmi/digital/posibrain/Initialize(mapload)
|
||||
. = ..()
|
||||
brainmob.name = "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]"
|
||||
brainmob.real_name = brainmob.name
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_DATA = 4)
|
||||
|
||||
/obj/item/mmi/digital/robot/New()
|
||||
..()
|
||||
src.brainmob.name = "[pick(list("ADA","DOS","GNU","MAC","WIN"))]-[rand(1000, 9999)]"
|
||||
src.brainmob.real_name = src.brainmob.name
|
||||
src.name = "robotic intelligence circuit ([src.brainmob.name])"
|
||||
/obj/item/mmi/digital/robot/Initialize(mapload)
|
||||
. = ..()
|
||||
brainmob.name = "[pick(list("ADA","DOS","GNU","MAC","WIN"))]-[rand(1000, 9999)]"
|
||||
brainmob.real_name = brainmob.name
|
||||
name = "robotic intelligence circuit ([brainmob.name])"
|
||||
|
||||
/obj/item/mmi/digital/robot/transfer_identity(var/mob/living/carbon/H)
|
||||
..()
|
||||
@@ -19,5 +19,5 @@
|
||||
to_chat(brainmob, span_notify("You feel slightly disoriented. That's normal when you're little more than a complex circuit."))
|
||||
return
|
||||
|
||||
/obj/item/mmi/digital/robot/attack_self(mob/user as mob)
|
||||
/obj/item/mmi/digital/robot/attack_self(mob/user)
|
||||
return //This object is technically a brain, and should not be dumping brains out of itself like its parent object does.
|
||||
|
||||
@@ -70,6 +70,12 @@
|
||||
|
||||
AddComponent(/datum/component/personal_crafting)
|
||||
|
||||
// Chicken Stuff
|
||||
var/animal = pick("cow","chicken_brown", "chicken_black", "chicken_white", "chick", "mouse_brown", "mouse_gray", "mouse_white", "lizard", "cat2", "goose", "penguin")
|
||||
var/image/img = image('icons/mob/animal.dmi', src, animal)
|
||||
img.override = TRUE
|
||||
add_alt_appearance("animals", img, displayTo = alt_farmanimals)
|
||||
|
||||
/mob/living/carbon/human/Destroy()
|
||||
human_mob_list -= src
|
||||
QDEL_NULL_LIST(organs)
|
||||
@@ -1856,3 +1862,9 @@
|
||||
resting = !resting
|
||||
to_chat(src, span_notice("You are now [resting ? "resting" : "getting up"]."))
|
||||
update_canmove()
|
||||
|
||||
/mob/living/carbon/human/get_digestion_nutrition_modifier()
|
||||
return species.digestion_nutrition_modifier
|
||||
|
||||
/mob/living/carbon/human/get_digestion_efficiency_modifier()
|
||||
return species.digestion_efficiency
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
//Crazy alternate human stuff
|
||||
/mob/living/carbon/human/New()
|
||||
. = ..()
|
||||
|
||||
var/animal = pick("cow","chicken_brown", "chicken_black", "chicken_white", "chick", "mouse_brown", "mouse_gray", "mouse_white", "lizard", "cat2", "goose", "penguin")
|
||||
var/image/img = image('icons/mob/animal.dmi', src, animal)
|
||||
img.override = TRUE
|
||||
add_alt_appearance("animals", img, displayTo = alt_farmanimals)
|
||||
|
||||
/mob/living/carbon/human/get_digestion_nutrition_modifier()
|
||||
return species.digestion_nutrition_modifier
|
||||
|
||||
/mob/living/carbon/human/get_digestion_efficiency_modifier()
|
||||
return species.digestion_efficiency
|
||||
@@ -34,8 +34,8 @@ var/global/list/default_pai_software = list()
|
||||
default_pai_software[P.id] = P
|
||||
return r
|
||||
|
||||
/mob/living/silicon/pai/New()
|
||||
..()
|
||||
/mob/living/silicon/pai/Initialize()
|
||||
. = ..()
|
||||
software = default_pai_software.Copy()
|
||||
|
||||
/mob/living/silicon/pai/verb/paiInterface()
|
||||
|
||||
@@ -57,8 +57,13 @@ var/global/list/robot_modules = list(
|
||||
/obj/item/robot_module/proc/hide_on_manifest()
|
||||
. = hide_on_manifest
|
||||
|
||||
/obj/item/robot_module/New(var/mob/living/silicon/robot/R)
|
||||
..()
|
||||
/obj/item/robot_module/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
if(!isrobot(loc))
|
||||
return
|
||||
|
||||
var/mob/living/silicon/robot/R = loc
|
||||
R.module = src
|
||||
|
||||
add_camera_networks(R)
|
||||
@@ -193,9 +198,12 @@ var/global/list/robot_modules = list(
|
||||
CHANNEL_EXPLORATION = 1
|
||||
)
|
||||
|
||||
/obj/item/robot_module/robot/New(var/mob/living/silicon/robot/R)
|
||||
..()
|
||||
/obj/item/robot_module/robot/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
if(!isrobot(loc))
|
||||
return
|
||||
var/mob/living/silicon/robot/R = loc
|
||||
if(R.sprite_datum)
|
||||
R.sprite_datum.do_equipment_glamour(src)
|
||||
|
||||
|
||||
@@ -183,7 +183,7 @@
|
||||
var/vore_icons_cache = null // null by default. Going from ON to OFF should store vore_icons val here, OFF to ON reset as null
|
||||
|
||||
|
||||
/mob/living/simple_mob/Initialize()
|
||||
/mob/living/simple_mob/Initialize(mapload)
|
||||
remove_verb(src, /mob/verb/observe)
|
||||
health = maxHealth
|
||||
|
||||
|
||||
@@ -8,9 +8,10 @@
|
||||
var/shift_mode = NOT_WHILE_SHIFTED
|
||||
var/ab_sound
|
||||
|
||||
/obj/effect/shadekin_ability/New(var/new_kin)
|
||||
..()
|
||||
my_kin = new_kin
|
||||
/obj/effect/shadekin_ability/Initialize(mapload)
|
||||
. = ..()
|
||||
if(issimplekin(loc))
|
||||
my_kin = loc
|
||||
loc = null
|
||||
|
||||
/obj/effect/shadekin_ability/Destroy()
|
||||
|
||||
@@ -57,9 +57,9 @@ List of things solar grubs should be able to do:
|
||||
/datum/say_list/solargrub
|
||||
emote_see = list("squelches", "squishes")
|
||||
|
||||
/mob/living/simple_mob/vore/solargrub/New()
|
||||
/mob/living/simple_mob/vore/solargrub/Initialize(mapload)
|
||||
. = ..()
|
||||
existing_solargrubs += src
|
||||
..()
|
||||
|
||||
/mob/living/simple_mob/vore/solargrub/Life()
|
||||
. = ..()
|
||||
|
||||
@@ -30,8 +30,8 @@
|
||||
|
||||
faction = FACTION_VAMPIRE
|
||||
|
||||
/mob/living/simple_mob/vore/vampire/New()
|
||||
..()
|
||||
/mob/living/simple_mob/vore/vampire/Initialize()
|
||||
. = ..()
|
||||
if(random_skin)
|
||||
icon_living = pick(skins)
|
||||
icon_rest = "[icon_living]asleep"
|
||||
@@ -113,6 +113,6 @@
|
||||
health = 350
|
||||
vore_pounce_chance = 75
|
||||
|
||||
/mob/living/simple_mob/vore/vampire/queen/New()
|
||||
/mob/living/simple_mob/vore/vampire/queen/Initialize(mapload)
|
||||
. = ..()
|
||||
resize(2)
|
||||
..()
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
spell_masters = null
|
||||
zone_sel = null
|
||||
|
||||
/mob/Initialize()
|
||||
/mob/Initialize(mapload)
|
||||
mob_list += src
|
||||
if(stat == DEAD)
|
||||
dead_mob_list += src
|
||||
|
||||
+11
-14
@@ -73,8 +73,8 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
|
||||
var/list/planes_visible = list()
|
||||
|
||||
//Constructor comes with a free AR HUD
|
||||
/obj/item/nif/New(var/newloc,var/wear,var/list/load_data)
|
||||
..(newloc)
|
||||
/obj/item/nif/Initialize(mapload,var/wear,var/list/load_data)
|
||||
. = ..()
|
||||
|
||||
//First one to spawn in the game, make a big icon
|
||||
if(!big_icon)
|
||||
@@ -90,13 +90,11 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
|
||||
examine_msg = saved_examine_msg
|
||||
|
||||
//If given a human on spawn (probably from persistence)
|
||||
if(ishuman(newloc))
|
||||
var/mob/living/carbon/human/H = newloc
|
||||
if(ishuman(loc))
|
||||
var/mob/living/carbon/human/H = loc
|
||||
if(!quick_implant(H))
|
||||
WARNING("NIF spawned in [H] failed to implant")
|
||||
spawn(0)
|
||||
qdel(src)
|
||||
return FALSE
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
//If given wear (like when spawned) then done
|
||||
if(wear)
|
||||
@@ -152,13 +150,12 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
|
||||
return FALSE
|
||||
forceMove(parent)
|
||||
parent.implants += src
|
||||
spawn(0) //Let the character finish spawning yo.
|
||||
if(!H) //Or letting them get deleted
|
||||
return
|
||||
if(H.mind)
|
||||
owner = H.mind.name
|
||||
owner_key = H.ckey
|
||||
implant(H)
|
||||
if(!H) //Or letting them get deleted
|
||||
return
|
||||
if(H.mind)
|
||||
owner = H.mind.name
|
||||
owner_key = H.ckey
|
||||
implant(H)
|
||||
return TRUE
|
||||
|
||||
return FALSE
|
||||
|
||||
@@ -522,8 +522,8 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
|
||||
parts = list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)
|
||||
|
||||
|
||||
/obj/item/disk/limb/New(var/newloc)
|
||||
..()
|
||||
/obj/item/disk/limb/Initialize(mapload)
|
||||
. = ..()
|
||||
if(company)
|
||||
name = "[company] [initial(name)]"
|
||||
|
||||
|
||||
@@ -74,18 +74,6 @@
|
||||
desc = "A gift card with a heart on the cover."
|
||||
icon_state = "greetingcard_heart"
|
||||
|
||||
/obj/item/paper/card/New()
|
||||
..()
|
||||
pixel_y = rand(-8, 8)
|
||||
pixel_x = rand(-9, 9)
|
||||
stamps = null
|
||||
|
||||
if(info != initial(info))
|
||||
info = html_encode(info)
|
||||
info = replacetext(info, "\n", "<BR>")
|
||||
info = parsepencode(info)
|
||||
return
|
||||
|
||||
/obj/item/paper/alien
|
||||
name = "alien tablet"
|
||||
desc = "It looks highly advanced"
|
||||
@@ -107,18 +95,16 @@
|
||||
//lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm!
|
||||
|
||||
/obj/item/paper/Initialize(mapload, var/text, var/title)
|
||||
. = ..()
|
||||
. = ..()
|
||||
|
||||
if(istext(title))
|
||||
name = title
|
||||
if(istext(text))
|
||||
info = text
|
||||
if(istext(title))
|
||||
name = title
|
||||
if(istext(text))
|
||||
info = text
|
||||
|
||||
if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player.
|
||||
was_maploaded = TRUE
|
||||
if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player.
|
||||
was_maploaded = TRUE
|
||||
|
||||
/obj/item/paper/New(var/newloc, var/text, var/title)
|
||||
..()
|
||||
pixel_y = rand(-8, 8)
|
||||
pixel_x = rand(-9, 9)
|
||||
stamps = ""
|
||||
@@ -137,11 +123,9 @@
|
||||
info = replacetext(info, "\n", "<BR>")
|
||||
info = parsepencode(info)
|
||||
|
||||
spawn(2)
|
||||
update_icon()
|
||||
update_space(info)
|
||||
updateinfolinks()
|
||||
return
|
||||
update_icon()
|
||||
update_space(info)
|
||||
updateinfolinks()
|
||||
|
||||
/obj/item/paper/update_icon()
|
||||
if(icon_state == "paper_talisman")
|
||||
|
||||
@@ -149,8 +149,8 @@
|
||||
throw_range = 3
|
||||
throw_speed = 1
|
||||
|
||||
/obj/item/shreddedp/New()
|
||||
..()
|
||||
/obj/item/shreddedp/Initialize(mapload)
|
||||
. = ..()
|
||||
pixel_x = rand(-5,5)
|
||||
pixel_y = rand(-5,5)
|
||||
if(prob(65)) color = pick("#BABABA","#7F7F7F")
|
||||
|
||||
@@ -37,11 +37,10 @@ var/global/photo_count = 0
|
||||
var/icon/tiny
|
||||
var/photo_size = 3
|
||||
|
||||
/obj/item/photo/New()
|
||||
/obj/item/photo/Initialize(mapload)
|
||||
. = ..()
|
||||
id = photo_count++
|
||||
|
||||
|
||||
|
||||
/obj/item/photo/attack_self(mob/user as mob)
|
||||
user.examinate(src)
|
||||
|
||||
|
||||
@@ -44,10 +44,10 @@
|
||||
ttone = "assist"
|
||||
var/our_owner = null // Ref to a pAI
|
||||
|
||||
/obj/item/pda/ai/pai/New(mob/living/silicon/pai/P)
|
||||
if(istype(P))
|
||||
our_owner = REF(P)
|
||||
return ..()
|
||||
/obj/item/pda/ai/pai/Initialize(mapload)
|
||||
. = ..()
|
||||
if(ispAI(loc))
|
||||
our_owner = REF(loc)
|
||||
|
||||
/obj/item/pda/ai/pai/tgui_status(mob/living/silicon/pai/user, datum/tgui_state/state)
|
||||
if(!istype(user) || REF(user) != our_owner) // Only allow our pAI to interface with us
|
||||
|
||||
@@ -250,8 +250,8 @@
|
||||
max_uses = 1
|
||||
desc = "This template spellbook was never meant for the eyes of man..."
|
||||
|
||||
/obj/item/spellbook/oneuse/New()
|
||||
..()
|
||||
/obj/item/spellbook/oneuse/Initialize(mapload)
|
||||
. = ..()
|
||||
name += spellname
|
||||
|
||||
/obj/item/spellbook/oneuse/attack_self(mob/user as mob)
|
||||
|
||||
@@ -3,77 +3,77 @@
|
||||
icon_state = "plain_preview"
|
||||
color = "#EEEEEE"
|
||||
|
||||
/obj/structure/table/standard/New()
|
||||
/obj/structure/table/standard/Initialize(mapload)
|
||||
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/steel
|
||||
icon_state = "plain_preview"
|
||||
color = "#666666"
|
||||
|
||||
/obj/structure/table/steel/New()
|
||||
/obj/structure/table/steel/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/marble
|
||||
icon_state = "stone_preview"
|
||||
color = "#CCCCCC"
|
||||
|
||||
/obj/structure/table/marble/New()
|
||||
/obj/structure/table/marble/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_MARBLE)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#EEEEEE"
|
||||
|
||||
/obj/structure/table/reinforced/New()
|
||||
/obj/structure/table/reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/steel_reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#666666"
|
||||
|
||||
/obj/structure/table/steel_reinforced/New()
|
||||
/obj/structure/table/steel_reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_STEEL)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/wooden_reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/wooden_reinforced/New()
|
||||
/obj/structure/table/wooden_reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_WOOD)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/woodentable
|
||||
icon_state = "plain_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/woodentable/New()
|
||||
/obj/structure/table/woodentable/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_WOOD)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/sifwoodentable
|
||||
icon_state = "plain_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/sifwoodentable/New()
|
||||
/obj/structure/table/sifwoodentable/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_SIFWOOD)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/sifwooden_reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/sifwooden_reinforced/New()
|
||||
/obj/structure/table/sifwooden_reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_SIFWOOD)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/hardwoodtable
|
||||
icon_state = "stone_preview"
|
||||
@@ -81,48 +81,48 @@
|
||||
|
||||
/obj/structure/table/hardwoodtable/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_HARDWOOD)
|
||||
return ..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/gamblingtable
|
||||
icon_state = "gamble_preview"
|
||||
|
||||
/obj/structure/table/gamblingtable/New()
|
||||
/obj/structure/table/gamblingtable/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_WOOD)
|
||||
carpeted = 1
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/glass
|
||||
icon_state = "plain_preview"
|
||||
color = "#00E1FF"
|
||||
alpha = 77 // 0.3 * 255
|
||||
|
||||
/obj/structure/table/glass/New()
|
||||
/obj/structure/table/glass/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_GLASS)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/borosilicate
|
||||
icon_state = "plain_preview"
|
||||
color = "#4D3EAC"
|
||||
alpha = 77
|
||||
|
||||
/obj/structure/table/borosilicate/New()
|
||||
/obj/structure/table/borosilicate/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_PGLASS)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/holotable
|
||||
icon_state = "holo_preview"
|
||||
color = "#EEEEEE"
|
||||
|
||||
/obj/structure/table/holotable/New()
|
||||
/obj/structure/table/holotable/Initialize(mapload)
|
||||
material = get_material_by_name("holo[DEFAULT_TABLE_MATERIAL]")
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/woodentable/holotable
|
||||
icon_state = "holo_preview"
|
||||
|
||||
/obj/structure/table/woodentable/holotable/New()
|
||||
/obj/structure/table/woodentable/holotable/Initialize(mapload)
|
||||
material = get_material_by_name("holowood")
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/alien
|
||||
name = "alien table"
|
||||
@@ -131,11 +131,11 @@
|
||||
can_reinforce = FALSE
|
||||
can_plate = FALSE
|
||||
|
||||
/obj/structure/table/alien/New()
|
||||
/obj/structure/table/alien/Initialize(mapload)
|
||||
material = get_material_by_name("alium")
|
||||
verbs -= /obj/structure/table/verb/do_flip
|
||||
verbs -= /obj/structure/table/proc/do_put
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/alien/dismantle(obj/item/tool/wrench/W, mob/user)
|
||||
to_chat(user, span_warning("You cannot dismantle \the [src]."))
|
||||
@@ -146,69 +146,69 @@
|
||||
icon_state = "plain_preview"
|
||||
color = "#EEEEEE"
|
||||
|
||||
/obj/structure/table/bench/standard/New()
|
||||
/obj/structure/table/bench/standard/Initialize(mapload)
|
||||
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/steel
|
||||
icon_state = "plain_preview"
|
||||
color = "#666666"
|
||||
|
||||
/obj/structure/table/bench/steel/New()
|
||||
/obj/structure/table/bench/steel/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
|
||||
/obj/structure/table/bench/marble
|
||||
icon_state = "stone_preview"
|
||||
color = "#CCCCCC"
|
||||
|
||||
/obj/structure/table/bench/marble/New()
|
||||
/obj/structure/table/bench/marble/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_MARBLE)
|
||||
..()
|
||||
. = ..()
|
||||
/*
|
||||
/obj/structure/table/bench/reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#EEEEEE"
|
||||
|
||||
/obj/structure/table/bench/reinforced/New()
|
||||
/obj/structure/table/bench/reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/steel_reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#666666"
|
||||
|
||||
/obj/structure/table/bench/steel_reinforced/New()
|
||||
/obj/structure/table/bench/steel_reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_STEEL)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/wooden_reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/bench/wooden_reinforced/New()
|
||||
/obj/structure/table/bench/wooden_reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_WOOD)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
*/
|
||||
/obj/structure/table/bench/wooden
|
||||
icon_state = "plain_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/bench/wooden/New()
|
||||
/obj/structure/table/bench/wooden/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_WOOD)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/sifwooden
|
||||
icon_state = "plain_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/bench/sifwooden/New()
|
||||
/obj/structure/table/bench/sifwooden/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_SIFWOOD)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/sifwooden/padded
|
||||
icon_state = "padded_preview"
|
||||
@@ -217,33 +217,33 @@
|
||||
/obj/structure/table/bench/padded
|
||||
icon_state = "padded_preview"
|
||||
|
||||
/obj/structure/table/bench/padded/New()
|
||||
/obj/structure/table/bench/padded/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_STEEL)
|
||||
carpeted = 1
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/glass
|
||||
icon_state = "plain_preview"
|
||||
color = "#00E1FF"
|
||||
alpha = 77 // 0.3 * 255
|
||||
|
||||
/obj/structure/table/bench/glass/New()
|
||||
/obj/structure/table/bench/glass/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_GLASS)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/*
|
||||
/obj/structure/table/bench/holotable
|
||||
icon_state = "holo_preview"
|
||||
color = "#EEEEEE"
|
||||
|
||||
/obj/structure/table/bench/holotable/New()
|
||||
/obj/structure/table/bench/holotable/Initialize(mapload)
|
||||
material = get_material_by_name("holo[DEFAULT_TABLE_MATERIAL]")
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/wooden/holotable
|
||||
icon_state = "holo_preview"
|
||||
|
||||
/obj/structure/table/bench/wooden/holotable/New()
|
||||
/obj/structure/table/bench/wooden/holotable/Initialize(mapload)
|
||||
material = get_material_by_name("holowood")
|
||||
..()
|
||||
. = ..()
|
||||
*/
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
can_reinforce = FALSE
|
||||
can_plate = FALSE
|
||||
|
||||
/obj/structure/table/darkglass/New()
|
||||
material = get_material_by_name("darkglass")
|
||||
/obj/structure/table/darkglass/Initialize()
|
||||
material = get_material_by_name(MAT_DARKGLASS)
|
||||
verbs -= /obj/structure/table/verb/do_flip
|
||||
verbs -= /obj/structure/table/proc/do_put
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/darkglass/dismantle(obj/item/tool/wrench/W, mob/user)
|
||||
to_chat(user, span_warning("You cannot dismantle \the [src]."))
|
||||
@@ -30,12 +30,12 @@
|
||||
can_reinforce = FALSE
|
||||
can_plate = FALSE
|
||||
|
||||
/obj/structure/table/fancyblack/New()
|
||||
material = get_material_by_name("fancyblack")
|
||||
/obj/structure/table/fancyblack/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_FANCYBLACK)
|
||||
verbs -= /obj/structure/table/verb/do_flip
|
||||
verbs -= /obj/structure/table/proc/do_put
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/fancyblack/dismantle(obj/item/tool/wrench/W, mob/user)
|
||||
to_chat(user, span_warning("You cannot dismantle \the [src]."))
|
||||
@@ -45,6 +45,6 @@
|
||||
icon_state = "plain_preview"
|
||||
color = "#FFFF00"
|
||||
|
||||
/obj/structure/table/gold/New()
|
||||
/obj/structure/table/gold/Initialize()
|
||||
material = get_material_by_name(MAT_GOLD)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
@@ -29,9 +29,9 @@
|
||||
user.visible_message(span_infoplain(span_bold("\The [user]") + " presses the lift button."))
|
||||
|
||||
|
||||
/obj/structure/lift/New(var/newloc, var/datum/turbolift/_lift)
|
||||
/obj/structure/lift/Initialize(mapload, var/datum/turbolift/_lift)
|
||||
. = ..()
|
||||
lift = _lift
|
||||
return ..(newloc)
|
||||
|
||||
/obj/structure/lift/attack_ai(var/mob/user)
|
||||
return attack_hand(user)
|
||||
|
||||
@@ -27,21 +27,21 @@
|
||||
|
||||
var/outdoors_speed_mod = 0.7 //The general 'outdoors' speed. I.E., the general difference you'll be at when driving outside.
|
||||
|
||||
/obj/vehicle/train/engine/quadbike/New()
|
||||
cell = new /obj/item/cell/high(src)
|
||||
key = new key_type(src)
|
||||
soundloop = new(list(src), FALSE)
|
||||
/obj/vehicle/train/engine/quadbike/Initialize(mapload, assembly)
|
||||
. = ..()
|
||||
if(!assembly)
|
||||
cell = new /obj/item/cell/high(src)
|
||||
soundloop = new(list(src), FALSE)
|
||||
key = new key_type(src)
|
||||
turn_off()
|
||||
update_icon()
|
||||
|
||||
/obj/vehicle/train/engine/quadbike/built/New()
|
||||
key = new key_type(src)
|
||||
turn_off()
|
||||
/obj/vehicle/train/engine/quadbike/built/Initialize(mapload)
|
||||
. = ..(mapload, TRUE)
|
||||
|
||||
/obj/vehicle/train/engine/quadbike/random/New()
|
||||
/obj/vehicle/train/engine/quadbike/random/Initialize(mapload)
|
||||
paint_color = rgb(rand(1,255),rand(1,255),rand(1,255))
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/vehicle/train/engine/quadbike/Destroy()
|
||||
QDEL_NULL(soundloop)
|
||||
@@ -202,9 +202,9 @@
|
||||
|
||||
paint_color = "#ffffff"
|
||||
|
||||
/obj/vehicle/train/trolley/trailer/random/New()
|
||||
/obj/vehicle/train/trolley/trailer/random/Initialize(mapload)
|
||||
paint_color = rgb(rand(1,255),rand(1,255),rand(1,255))
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/vehicle/train/trolley/trailer/proc/update_load()
|
||||
if(load)
|
||||
|
||||
@@ -20,8 +20,8 @@
|
||||
|
||||
var/fail_message
|
||||
|
||||
/obj/machinery/replicator/New()
|
||||
..()
|
||||
/obj/machinery/replicator/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
var/list/viables = list(
|
||||
/obj/item/roller,
|
||||
|
||||
@@ -9,12 +9,13 @@
|
||||
desc = "It's a fossil."
|
||||
var/animal = 1
|
||||
|
||||
/obj/item/fossil/base/New()
|
||||
/obj/item/fossil/base/Initialize(mapload)
|
||||
..()
|
||||
var/list/l = list(/obj/item/fossil/bone = 9,/obj/item/fossil/skull = 3,
|
||||
/obj/item/fossil/skull/horned = 2)
|
||||
var/t = pickweight(l)
|
||||
new t(src.loc)
|
||||
qdel(src)
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/obj/item/fossil/bone
|
||||
name = "Fossilised bone"
|
||||
@@ -30,7 +31,7 @@
|
||||
icon_state = "hskull"
|
||||
desc = "It's a fossilised, horned skull."
|
||||
|
||||
/obj/item/fossil/skull/attackby(obj/item/W as obj, mob/user as mob)
|
||||
/obj/item/fossil/skull/attackby(obj/item/W, mob/user)
|
||||
if(istype(W,/obj/item/fossil/bone))
|
||||
var/obj/o = new /obj/skeleton(get_turf(src))
|
||||
var/a = new /obj/item/fossil/bone
|
||||
@@ -50,9 +51,10 @@
|
||||
var/bstate = 0
|
||||
var/plaque_contents = "Unnamed alien creature"
|
||||
|
||||
/obj/skeleton/New()
|
||||
src.breq = rand(6)+3
|
||||
src.desc = "An incomplete skeleton, looks like it could use [src.breq-src.bnum] more bones."
|
||||
/obj/skeleton/Initialize(mapload)
|
||||
. = ..()
|
||||
breq = rand(6)+3
|
||||
desc = "An incomplete skeleton, looks like it could use [breq-bnum] more bones."
|
||||
|
||||
/obj/skeleton/attackby(obj/item/W, mob/user)
|
||||
if(istype(W,/obj/item/fossil/bone))
|
||||
@@ -96,5 +98,6 @@
|
||||
desc = "It's fossilised plant remains."
|
||||
animal = 0
|
||||
|
||||
/obj/item/fossil/plant/New()
|
||||
/obj/item/fossil/plant/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_state = "plant[rand(1,4)]"
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
capacity = 100000000
|
||||
|
||||
/*
|
||||
/obj/item/anobattery/New()
|
||||
/obj/item/anobattery/Initialize(mapload)
|
||||
battery_effect = new()
|
||||
*/
|
||||
|
||||
@@ -63,8 +63,8 @@
|
||||
var/energy_consumed_on_touch = 100
|
||||
var/mob/last_user_touched
|
||||
|
||||
/obj/item/anodevice/New()
|
||||
..()
|
||||
/obj/item/anodevice/Initialize(mapload)
|
||||
. = ..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/item/anodevice/Destroy()
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
name = "sample bag box"
|
||||
desc = "A box claiming to contain sample bags."
|
||||
|
||||
/obj/item/storage/box/samplebags/New()
|
||||
..()
|
||||
/obj/item/storage/box/samplebags/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/i = 1 to 7)
|
||||
var/obj/item/evidencebag/S = new(src)
|
||||
S.name = "sample bag"
|
||||
@@ -232,8 +232,8 @@
|
||||
var/scan_ticks = 0
|
||||
var/obj/item/radio/target_radio
|
||||
|
||||
/obj/item/beacon_locator/New()
|
||||
..()
|
||||
/obj/item/beacon_locator/Initialize(mapload)
|
||||
. = ..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
/obj/item/beacon_locator/Destroy()
|
||||
@@ -333,7 +333,8 @@
|
||||
var/obj/item/ano_scanner/anomaly_scanner = null
|
||||
var/obj/item/depth_scanner/depth_scanner = null
|
||||
|
||||
/obj/item/xenoarch_multi_tool/New()
|
||||
/obj/item/xenoarch_multi_tool/Initialize(mapload)
|
||||
. = ..()
|
||||
anomaly_scanner = new/obj/item/ano_scanner(src)
|
||||
depth_scanner = new/obj/item/depth_scanner(src)
|
||||
|
||||
|
||||
@@ -127,8 +127,8 @@
|
||||
max_w_class = ITEMSIZE_SMALL
|
||||
use_to_pickup = TRUE
|
||||
|
||||
/obj/item/storage/excavation/New()
|
||||
..()
|
||||
/obj/item/storage/excavation/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/pickaxe/brush(src)
|
||||
new /obj/item/pickaxe/one_pick(src)
|
||||
new /obj/item/pickaxe/two_pick(src)
|
||||
|
||||
@@ -34,8 +34,8 @@
|
||||
name = "biological disk box"
|
||||
desc = "A box of biological data disks, apparently."
|
||||
|
||||
/obj/item/storage/box/xenobiodisk/New()
|
||||
..()
|
||||
/obj/item/storage/box/xenobiodisk/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/i = 0 to 7)
|
||||
new /obj/item/disk/xenobio(src)
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
gas_data.molar_mass[gas.id] = gas.molar_mass
|
||||
if(gas.tile_overlay)
|
||||
gas_data.tile_overlay[gas.id] = new /atom/movable/gas_visuals(null, gas.tile_overlay)
|
||||
if(gas.overlay_limit)
|
||||
if(gas.overlay_limit)
|
||||
gas_data.overlay_limit[gas.id] = gas.overlay_limit
|
||||
gas_data.flags[gas.id] = gas.flags
|
||||
|
||||
@@ -51,6 +51,7 @@
|
||||
icon = 'icons/effects/tile_effects.dmi'
|
||||
mouse_opacity = 0
|
||||
plane = ABOVE_MOB_PLANE
|
||||
/atom/movable/gas_visuals/New(newloc, ico)
|
||||
..()
|
||||
icon_state = ico
|
||||
|
||||
/atom/movable/gas_visuals/Initialize(mapload, ico)
|
||||
. = ..()
|
||||
icon_state = ico
|
||||
|
||||
Reference in New Issue
Block a user