mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] some more new to init (#10270)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
3444e3e21d
commit
ad0915a957
@@ -6,11 +6,8 @@
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
icon_state = "dirt"
|
||||
|
||||
/obj/effect/decal/cleanable/chemcoating/New()
|
||||
..()
|
||||
create_reagents(100)
|
||||
|
||||
/obj/effect/decal/cleanable/chemcoating/Initialize()
|
||||
create_reagents(100)
|
||||
. = ..()
|
||||
var/turf/T = get_turf(src)
|
||||
if(T)
|
||||
|
||||
@@ -142,8 +142,8 @@
|
||||
can_atmos_pass = ATMOS_PASS_NO
|
||||
var/metal = 1 // 1 = aluminum, 2 = iron
|
||||
|
||||
/obj/structure/foamedmetal/New()
|
||||
..()
|
||||
/obj/structure/foamedmetal/Initialize(mapload)
|
||||
. = ..()
|
||||
update_nearby_tiles(1)
|
||||
|
||||
/obj/structure/foamedmetal/Destroy()
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
|
||||
/obj/effect/decal/cleanable/greenglow
|
||||
|
||||
/obj/effect/decal/cleanable/greenglow/New()
|
||||
..()
|
||||
/obj/effect/decal/cleanable/greenglow/Initialize(mapload, _age)
|
||||
. = ..()
|
||||
QDEL_IN(src, 2 MINUTES)
|
||||
|
||||
/obj/effect/decal/cleanable/dirt
|
||||
|
||||
@@ -33,10 +33,10 @@ generic_filth = TRUE means when the decal is saved, it will be switched out for
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/effect/decal/cleanable/New()
|
||||
if (random_icon_states && length(src.random_icon_states) > 0)
|
||||
src.icon_state = pick(src.random_icon_states)
|
||||
..()
|
||||
/obj/effect/decal/cleanable/Initialize(mapload, _age)
|
||||
. = ..()
|
||||
if (random_icon_states && length(random_icon_states) > 0)
|
||||
icon_state = pick(random_icon_states)
|
||||
|
||||
|
||||
/obj/effect/decal/cleanable/update_icon()
|
||||
|
||||
@@ -8,71 +8,58 @@
|
||||
invisibility = 100
|
||||
var/delete_me = 0
|
||||
|
||||
/obj/effect/landmark/New()
|
||||
..()
|
||||
/obj/effect/landmark/Initialize(mapload)
|
||||
. = ..()
|
||||
tag = text("landmark*[]", name)
|
||||
invisibility = 101
|
||||
|
||||
switch(name) //some of these are probably obsolete
|
||||
if("monkey")
|
||||
monkeystart += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("start")
|
||||
newplayer_start += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("JoinLate") // Bit difference, since we need the spawn point to move.
|
||||
latejoin += src
|
||||
simulated = TRUE
|
||||
// delete_me = 1
|
||||
return
|
||||
//VOREStation Add end
|
||||
if("Observer-Start") // Ghosts are the only thing that use the latejoin list afaik and it complains if there's nothing in the list.
|
||||
latejoin += src
|
||||
simulated = TRUE
|
||||
return
|
||||
//VOREStation Add end
|
||||
if("JoinLateGateway")
|
||||
latejoin_gateway += loc
|
||||
// CHOMPEdit Start
|
||||
delete_me = 1
|
||||
delete_me = TRUE
|
||||
// CHOMPEdit End
|
||||
return
|
||||
//CHOMPEdit Begin
|
||||
if("JoinLateStationGateway")
|
||||
GLOB.latejoin_gatewaystation += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("JoinLateSifPlains")
|
||||
GLOB.latejoin_plainspath += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("JoinLateFuelDepot")
|
||||
GLOB.latejoin_fueldepot += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("JoinLateTyrVillage")
|
||||
GLOB.latejoin_tyrvillage += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
//CHOMPEdit End
|
||||
if("JoinLateElevator")
|
||||
latejoin_elevator += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("JoinLateCryo")
|
||||
latejoin_cryo += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("JoinLateCyborg")
|
||||
latejoin_cyborg += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("prisonwarp")
|
||||
prisonwarp += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("Holding Facility")
|
||||
holdingfacility += loc
|
||||
if("tdome1")
|
||||
@@ -85,39 +72,27 @@
|
||||
tdomeobserve += loc
|
||||
if("prisonsecuritywarp")
|
||||
prisonsecuritywarp += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("blobstart")
|
||||
blobstart += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("xeno_spawn")
|
||||
xeno_spawn += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("endgame_exit")
|
||||
endgame_safespawns += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
if("bluespacerift")
|
||||
endgame_exits += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
//VOREStation Add Start
|
||||
if("vinestart")
|
||||
vinestart += loc
|
||||
delete_me = 1
|
||||
return
|
||||
delete_me = TRUE
|
||||
//VORE Station Add End
|
||||
|
||||
landmarks_list += src
|
||||
return 1
|
||||
|
||||
/obj/effect/landmark/proc/delete()
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/Initialize()
|
||||
. = ..()
|
||||
if(delete_me)
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
@@ -133,16 +108,16 @@
|
||||
icon_state = "x"
|
||||
anchored = TRUE
|
||||
|
||||
/obj/effect/landmark/start/New()
|
||||
..()
|
||||
/obj/effect/landmark/start/Initialize(mapload)
|
||||
. = ..()
|
||||
tag = "start*[name]"
|
||||
invisibility = 101
|
||||
|
||||
return 1
|
||||
|
||||
/obj/effect/landmark/forbidden_level
|
||||
delete_me = 1
|
||||
/obj/effect/landmark/forbidden_level/Initialize()
|
||||
delete_me = TRUE
|
||||
|
||||
/obj/effect/landmark/forbidden_level/Initialize(mapload)
|
||||
. = ..()
|
||||
if(using_map)
|
||||
using_map.secret_levels |= z
|
||||
@@ -150,8 +125,9 @@
|
||||
log_error("[type] mapped in but no using_map")
|
||||
|
||||
/obj/effect/landmark/hidden_level
|
||||
delete_me = 1
|
||||
/obj/effect/landmark/hidden_level/Initialize()
|
||||
delete_me = TRUE
|
||||
|
||||
/obj/effect/landmark/hidden_level/Initialize(mapload)
|
||||
. = ..()
|
||||
if(using_map)
|
||||
using_map.hidden_levels |= z
|
||||
@@ -165,79 +141,80 @@
|
||||
icon_state = "x"
|
||||
anchored = TRUE
|
||||
|
||||
/obj/effect/landmark/virtual_reality/New()
|
||||
..()
|
||||
/obj/effect/landmark/virtual_reality/Initialize(mapload)
|
||||
. = ..()
|
||||
tag = "virtual_reality*[name]"
|
||||
invisibility = 101
|
||||
return 1
|
||||
|
||||
/obj/effect/landmark/costume
|
||||
delete_me = TRUE
|
||||
|
||||
//Costume spawner landmarks
|
||||
/obj/effect/landmark/costume/New() //costume spawner, selects a random subclass and disappears
|
||||
|
||||
var/list/options = typesof(/obj/effect/landmark/costume)
|
||||
var/PICK= options[rand(1,options.len)]
|
||||
new PICK(src.loc)
|
||||
delete_me = 1
|
||||
/obj/effect/landmark/costume/Initialize(mapload) //costume spawner, selects a random subclass and disappears
|
||||
. = ..()
|
||||
if(type == /obj/effect/landmark/costume)
|
||||
var/list/options = subtypesof(/obj/effect/landmark/costume)
|
||||
var/PICK= options[rand(1,options.len)]
|
||||
new PICK(src.loc)
|
||||
|
||||
//SUBCLASSES. Spawn a bunch of items and disappear likewise
|
||||
/obj/effect/landmark/costume/chicken/New()
|
||||
/obj/effect/landmark/costume/chicken/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/suit/chickensuit(src.loc)
|
||||
new /obj/item/clothing/head/chicken(src.loc)
|
||||
new /obj/item/reagent_containers/food/snacks/egg(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/gladiator/New()
|
||||
/obj/effect/landmark/costume/gladiator/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/under/gladiator(src.loc)
|
||||
new /obj/item/clothing/head/helmet/gladiator(src.loc)
|
||||
qdel(src)
|
||||
|
||||
/obj/effect/landmark/costume/madscientist/New()
|
||||
/obj/effect/landmark/costume/madscientist/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/under/suit_jacket/green(src.loc)
|
||||
new /obj/item/clothing/head/flatcap(src.loc)
|
||||
new /obj/item/clothing/suit/storage/toggle/labcoat/mad(src.loc)
|
||||
new /obj/item/clothing/glasses/gglasses(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/elpresidente/New()
|
||||
/obj/effect/landmark/costume/elpresidente/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/under/suit_jacket/green(src.loc)
|
||||
new /obj/item/clothing/head/flatcap(src.loc)
|
||||
new /obj/item/clothing/mask/smokable/cigarette/cigar/havana(src.loc)
|
||||
new /obj/item/clothing/shoes/boots/jackboots(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/nyangirl/New()
|
||||
/obj/effect/landmark/costume/nyangirl/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/under/schoolgirl(src.loc)
|
||||
new /obj/item/clothing/head/kitty(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/maid/New()
|
||||
/obj/effect/landmark/costume/maid/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/under/skirt(src.loc)
|
||||
var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
|
||||
new CHOICE(src.loc)
|
||||
new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/butler/New()
|
||||
/obj/effect/landmark/costume/butler/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/accessory/wcoat(src.loc)
|
||||
new /obj/item/clothing/under/suit_jacket(src.loc)
|
||||
new /obj/item/clothing/head/that(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/scratch/New()
|
||||
/obj/effect/landmark/costume/scratch/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/gloves/white(src.loc)
|
||||
new /obj/item/clothing/shoes/white(src.loc)
|
||||
new /obj/item/clothing/under/scratch(src.loc)
|
||||
if (prob(30))
|
||||
new /obj/item/clothing/head/cueball(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/highlander/New()
|
||||
/obj/effect/landmark/costume/highlander/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/under/kilt(src.loc)
|
||||
new /obj/item/clothing/head/beret(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/prig/New()
|
||||
/obj/effect/landmark/costume/prig/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/accessory/wcoat(src.loc)
|
||||
new /obj/item/clothing/glasses/monocle(src.loc)
|
||||
var/CHOICE= pick( /obj/item/clothing/head/bowler, /obj/item/clothing/head/that)
|
||||
@@ -246,71 +223,70 @@
|
||||
new /obj/item/cane(src.loc)
|
||||
new /obj/item/clothing/under/sl_suit(src.loc)
|
||||
new /obj/item/clothing/mask/fakemoustache(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/plaguedoctor/New()
|
||||
/obj/effect/landmark/costume/plaguedoctor/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/suit/bio_suit/plaguedoctorsuit(src.loc)
|
||||
new /obj/item/clothing/head/plaguedoctorhat(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/nightowl/New()
|
||||
/obj/effect/landmark/costume/nightowl/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/under/owl(src.loc)
|
||||
new /obj/item/clothing/mask/gas/owl_mask(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/waiter/New()
|
||||
/obj/effect/landmark/costume/waiter/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/under/waiter(src.loc)
|
||||
var/CHOICE= pick( /obj/item/clothing/head/kitty, /obj/item/clothing/head/rabbitears)
|
||||
new CHOICE(src.loc)
|
||||
new /obj/item/clothing/suit/storage/apron(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/pirate/New()
|
||||
/obj/effect/landmark/costume/pirate/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/under/pirate(src.loc)
|
||||
new /obj/item/clothing/suit/pirate(src.loc)
|
||||
var/CHOICE = pick( /obj/item/clothing/head/pirate , /obj/item/clothing/head/bandana )
|
||||
new CHOICE(src.loc)
|
||||
new /obj/item/clothing/glasses/eyepatch(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/commie/New()
|
||||
/obj/effect/landmark/costume/commie/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/under/soviet(src.loc)
|
||||
new /obj/item/clothing/head/ushanka(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/imperium_monk/New()
|
||||
/obj/effect/landmark/costume/imperium_monk/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/suit/imperium_monk(src.loc)
|
||||
if (prob(25))
|
||||
new /obj/item/clothing/mask/gas/cyborg(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/holiday_priest/New()
|
||||
/obj/effect/landmark/costume/holiday_priest/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/suit/holidaypriest(src.loc)
|
||||
qdel(src)
|
||||
|
||||
/obj/effect/landmark/costume/marisawizard/fake/New()
|
||||
/obj/effect/landmark/costume/marisawizard/fake/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/head/wizard/marisa/fake(src.loc)
|
||||
new/obj/item/clothing/suit/wizrobe/marisa/fake(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/cutewitch/New()
|
||||
/obj/effect/landmark/costume/cutewitch/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/under/sundress(src.loc)
|
||||
new /obj/item/clothing/head/witchwig(src.loc)
|
||||
new /obj/item/staff/broom(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/fakewizard/New()
|
||||
/obj/effect/landmark/costume/fakewizard/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/suit/wizrobe/fake(src.loc)
|
||||
new /obj/item/clothing/head/wizard/fake(src.loc)
|
||||
new /obj/item/staff/(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/sexyclown/New()
|
||||
/obj/effect/landmark/costume/sexyclown/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/mask/gas/sexyclown(src.loc)
|
||||
new /obj/item/clothing/under/sexyclown(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
/obj/effect/landmark/costume/sexymime/New()
|
||||
/obj/effect/landmark/costume/sexymime/Initialize(mapload)
|
||||
. = ..()
|
||||
new /obj/item/clothing/mask/gas/sexymime(src.loc)
|
||||
new /obj/item/clothing/under/sexymime(src.loc)
|
||||
delete_me = 1
|
||||
|
||||
@@ -16,8 +16,8 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm
|
||||
var/isLoud = FALSE
|
||||
var/isNarrate = FALSE
|
||||
|
||||
/obj/effect/landmark/event_trigger/New()
|
||||
..()
|
||||
/obj/effect/landmark/event_trigger/Initialize()
|
||||
. = ..()
|
||||
coordinates = "(X:[loc.x];Y:[loc.y];Z:[loc.z])"
|
||||
|
||||
/obj/effect/landmark/event_trigger/proc/set_vars(mob/M)
|
||||
@@ -89,9 +89,9 @@ Admin verb is called by code\modules\admin\verbs\event_triggers.dm
|
||||
var/isWarning = FALSE //For personal messages
|
||||
isNarrate = TRUE
|
||||
|
||||
/obj/effect/landmark/event_trigger/auto_narrate/New()
|
||||
/obj/effect/landmark/event_trigger/auto_narrate/Initialize()
|
||||
. = ..()
|
||||
message_range = world.view
|
||||
..()
|
||||
|
||||
/obj/effect/landmark/event_trigger/auto_narrate/set_vars(mob/M)
|
||||
..()
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
plane = ABOVE_OBJ_PLANE
|
||||
var/tmp/atom/BeamSource
|
||||
|
||||
/obj/effect/overlay/beam/New()
|
||||
..()
|
||||
spawn(10) qdel(src)
|
||||
/obj/effect/overlay/beam/Initialize(mapload)
|
||||
. = ..()
|
||||
QDEL_IN(src, 1 SECOND)
|
||||
|
||||
/obj/effect/overlay/palmtree_r
|
||||
name = "Palm tree"
|
||||
|
||||
@@ -31,10 +31,10 @@
|
||||
M.Turn(angle)
|
||||
transform = M
|
||||
|
||||
/obj/effect/projectile/New(angle_override, p_x, p_y, color_override, scaling = 1)
|
||||
/obj/effect/projectile/Initialize(mapload, angle_override, p_x, p_y, color_override, scaling = 1)
|
||||
. = ..()
|
||||
if(angle_override && p_x && p_y && color_override && scaling)
|
||||
apply_vars(angle_override, p_x, p_y, color_override, scaling)
|
||||
return ..()
|
||||
|
||||
/obj/effect/projectile/proc/apply_vars(angle_override, p_x = 0, p_y = 0, color_override, scaling = 1, new_loc, increment = 0)
|
||||
var/mutable_appearance/look = new(src)
|
||||
@@ -54,7 +54,7 @@
|
||||
/obj/effect/projectile_lighting
|
||||
var/owner
|
||||
|
||||
/obj/effect/projectile_lighting/New(loc, color, range, intensity, owner_key)
|
||||
/obj/effect/projectile_lighting/Initialize(mapload, color, range, intensity, owner_key)
|
||||
. = ..()
|
||||
set_light(range, intensity, color)
|
||||
owner = owner_key
|
||||
|
||||
@@ -360,7 +360,7 @@ var/global/list/obj/item/communicator/all_communicators = list()
|
||||
// Proc: New()
|
||||
// Parameters: None
|
||||
// Description: Gives ghosts an exonet address based on their key and ghost name.
|
||||
/mob/observer/dead/Initialize()
|
||||
/mob/observer/dead/Initialize(mapload)
|
||||
. = ..()
|
||||
exonet = new(src)
|
||||
if(client)
|
||||
|
||||
@@ -75,7 +75,7 @@ var/global/list/default_medbay_channels = list(
|
||||
frequency = new_frequency
|
||||
radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
|
||||
|
||||
/obj/item/radio/Initialize()
|
||||
/obj/item/radio/Initialize(mapload)
|
||||
. = ..()
|
||||
if(frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ)
|
||||
frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)
|
||||
@@ -84,6 +84,13 @@ var/global/list/default_medbay_channels = list(
|
||||
for (var/ch_name in channels)
|
||||
secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)
|
||||
|
||||
wires = new(src)
|
||||
internal_channels = default_internal_channels.Copy()
|
||||
listening_objects += src
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/obj/item/radio/LateInitialize()
|
||||
. = ..()
|
||||
if(bluespace_radio)
|
||||
if(bs_tx_preload_id)
|
||||
//Try to find a receiver
|
||||
@@ -120,11 +127,6 @@ var/global/list/default_medbay_channels = list(
|
||||
if(!found)
|
||||
testing("A radio [src] at [x],[y],[z] specified bluespace prelink IDs, but the machines with corresponding IDs ([bs_tx_preload_id], [bs_rx_preload_id]) couldn't be found.")
|
||||
|
||||
wires = new(src)
|
||||
internal_channels = default_internal_channels.Copy()
|
||||
listening_objects += src
|
||||
return INITIALIZE_HINT_LATELOAD
|
||||
|
||||
/obj/item/radio/Destroy()
|
||||
qdel(wires)
|
||||
wires = null
|
||||
|
||||
@@ -28,9 +28,9 @@
|
||||
desc = "The top of this twisted chunk of metal is faintly stamped with a five pointed star. 'Property of US Army, Pascal B - 1957'."
|
||||
catalogue_data = list(/datum/category_item/catalogue/information/objects/pascalb)
|
||||
|
||||
/obj/item/poi/pascalb/New()
|
||||
/obj/item/poi/pascalb/Initialize(mapload)
|
||||
. = ..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
return ..()
|
||||
|
||||
/obj/item/poi/pascalb/process()
|
||||
SSradiation.radiate(src, 5)
|
||||
@@ -75,9 +75,9 @@
|
||||
desc = "This broken hunk of machinery looks extremely dangerous."
|
||||
catalogue_data = list(/datum/category_item/catalogue/information/objects/oldreactor)
|
||||
|
||||
/obj/item/poi/brokenoldreactor/New()
|
||||
/obj/item/poi/brokenoldreactor/Initialize(mapload)
|
||||
. = ..()
|
||||
START_PROCESSING(SSobj, src)
|
||||
return ..()
|
||||
|
||||
/obj/item/poi/brokenoldreactor/process()
|
||||
SSradiation.radiate(src, 25)
|
||||
@@ -134,7 +134,8 @@
|
||||
var/has_paper = FALSE
|
||||
|
||||
|
||||
/obj/item/poi/broken_drone_circuit/New()
|
||||
/obj/item/poi/broken_drone_circuit/Initialize(mapload)
|
||||
. = ..()
|
||||
drone_name = "[pick(list("ADA","DOS","GNU","MAC","WIN","NJS","SKS","DRD","IOS","CRM","IBM","TEX","LVM","BSD",))]-[rand(1000, 9999)]]"
|
||||
var/new_canalyzer = "[drone_name] [examine_canalyzer]" //Only way I could think to dynamically insert drone name here
|
||||
examine_canalyzer = new_canalyzer
|
||||
|
||||
@@ -83,10 +83,9 @@
|
||||
icon_state = "healthhud"
|
||||
icon = 'icons/inventory/eyes/item.dmi'
|
||||
|
||||
/obj/item/borg/sight/hud/med/New()
|
||||
..()
|
||||
/obj/item/borg/sight/hud/med/Initialize(mapload)
|
||||
. = ..()
|
||||
hud = new /obj/item/clothing/glasses/hud/health(src)
|
||||
return
|
||||
|
||||
|
||||
/obj/item/borg/sight/hud/sec
|
||||
@@ -94,7 +93,6 @@
|
||||
icon_state = "securityhud"
|
||||
icon = 'icons/inventory/eyes/item.dmi'
|
||||
|
||||
/obj/item/borg/sight/hud/sec/New()
|
||||
..()
|
||||
/obj/item/borg/sight/hud/sec/Initialize(mapload)
|
||||
. = ..()
|
||||
hud = new /obj/item/clothing/glasses/hud/security(src)
|
||||
return
|
||||
|
||||
@@ -93,7 +93,7 @@ var/list/marker_beacon_colors = list(
|
||||
var/perma = FALSE
|
||||
var/mapped_in_color
|
||||
|
||||
/obj/structure/marker_beacon/New(newloc, set_color)
|
||||
/obj/structure/marker_beacon/Initialize(mapload, set_color)
|
||||
. = ..()
|
||||
if(set_color)
|
||||
picked_color = set_color
|
||||
|
||||
@@ -36,7 +36,8 @@
|
||||
icon_state = "waterballoon-e"
|
||||
drop_sound = 'sound/items/drop/rubber.ogg'
|
||||
|
||||
/obj/item/toy/balloon/New()
|
||||
/obj/item/toy/balloon/Initialize(mapload)
|
||||
. = ..()
|
||||
var/datum/reagents/R = new/datum/reagents(10)
|
||||
reagents = R
|
||||
R.my_atom = src
|
||||
@@ -300,8 +301,8 @@
|
||||
var/toysay = "What the fuck did you do?"
|
||||
drop_sound = 'sound/items/drop/accessory.ogg'
|
||||
|
||||
/obj/item/toy/figure/New()
|
||||
..()
|
||||
/obj/item/toy/figure/Initialize(mapload)
|
||||
. = ..()
|
||||
desc = "A \"Space Life\" brand [name]"
|
||||
|
||||
/obj/item/toy/figure/attack_self(mob/user as mob)
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
var/wax = 2000
|
||||
var/icon_type = "candle"
|
||||
|
||||
/obj/item/flame/candle/New()
|
||||
/obj/item/flame/candle/Initialize(mapload)
|
||||
. = ..()
|
||||
wax -= rand(800, 1000) // Enough for 27-33 minutes. 30 minutes on average.
|
||||
..()
|
||||
|
||||
/obj/item/flame/candle/update_icon()
|
||||
var/i
|
||||
|
||||
@@ -171,12 +171,12 @@
|
||||
var/open_state
|
||||
var/closed_state
|
||||
|
||||
/obj/item/storage/box/fancy/chewables/tobacco/nico/New()
|
||||
/obj/item/storage/box/fancy/chewables/tobacco/nico/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!open_state)
|
||||
open_state = "[initial(icon_state)]0"
|
||||
if(!closed_state)
|
||||
closed_state = "[initial(icon_state)]"
|
||||
..()
|
||||
|
||||
/obj/item/storage/box/fancy/chewables/tobacco/nico/update_icon()
|
||||
cut_overlays()
|
||||
|
||||
@@ -430,8 +430,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
ignitermes = span_notice("USER fiddles with FLAME, and manages to light their NAME with the power of science.")
|
||||
is_pipe = 1
|
||||
|
||||
/obj/item/clothing/mask/smokable/pipe/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/smokable/pipe/Initialize()
|
||||
. = ..()
|
||||
name = "empty [initial(name)]"
|
||||
|
||||
/obj/item/clothing/mask/smokable/pipe/attack_self(mob/user as mob)
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
/*
|
||||
* Soap
|
||||
*/
|
||||
/obj/item/soap/Initialize()
|
||||
/obj/item/soap/Initialize(mapload)
|
||||
. = ..()
|
||||
create_reagents(5)
|
||||
wet()
|
||||
|
||||
@@ -26,7 +26,8 @@
|
||||
/obj/item/lipstick/random
|
||||
name = "lipstick"
|
||||
|
||||
/obj/item/lipstick/random/New()
|
||||
/obj/item/lipstick/random/Initialize(mapload)
|
||||
. = ..()
|
||||
colour = pick("red","purple","jade","black")
|
||||
name = "[colour] lipstick"
|
||||
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
var/icon_empty
|
||||
var/ecig_colors = list(null, COLOR_DARK_GRAY, COLOR_RED_GRAY, COLOR_BLUE_GRAY, COLOR_GREEN_GRAY, COLOR_PURPLE_GRAY)
|
||||
|
||||
/obj/item/clothing/mask/smokable/ecig/New()
|
||||
..()
|
||||
/obj/item/clothing/mask/smokable/ecig/Initialize(mapload)
|
||||
. = ..()
|
||||
ec_cartridge = new cartridge_type(src)
|
||||
|
||||
/obj/item/clothing/mask/smokable/ecig/examine(mob/user)
|
||||
@@ -61,8 +61,9 @@
|
||||
icon_off = "ecigoff1"
|
||||
icon_empty = "ecigoff1"
|
||||
icon_on = "ecigon"
|
||||
/obj/item/clothing/mask/smokable/ecig/util/New()
|
||||
..()
|
||||
|
||||
/obj/item/clothing/mask/smokable/ecig/util/Initialize(mapload)
|
||||
. = ..()
|
||||
color = pick(ecig_colors)
|
||||
|
||||
/obj/item/clothing/mask/smokable/ecig/deluxe
|
||||
@@ -152,9 +153,7 @@
|
||||
matter = list(MAT_STEEL = 50, MAT_GLASS = 10)
|
||||
volume = 20
|
||||
flags = OPENCONTAINER
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/New()
|
||||
create_reagents(volume)
|
||||
possible_transfer_amounts = null
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/examine(mob/user as mob)//to see how much left
|
||||
. = ..()
|
||||
@@ -168,32 +167,36 @@
|
||||
/obj/item/reagent_containers/ecig_cartridge/blanknico
|
||||
name = "flavorless nicotine cartridge"
|
||||
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says you can add whatever flavoring agents you want."
|
||||
/obj/item/reagent_containers/ecig_cartridge/blanknico/New()
|
||||
..()
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/blanknico/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
|
||||
reagents.add_reagent(REAGENT_ID_WATER, 10)
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/med_nicotine
|
||||
name = "tobacco flavour cartridge"
|
||||
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored."
|
||||
/obj/item/reagent_containers/ecig_cartridge/med_nicotine/New()
|
||||
..()
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/med_nicotine/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
|
||||
reagents.add_reagent(REAGENT_ID_WATER, 15)
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/high_nicotine
|
||||
name = "high nicotine tobacco flavour cartridge"
|
||||
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored, with extra nicotine."
|
||||
/obj/item/reagent_containers/ecig_cartridge/high_nicotine/New()
|
||||
..()
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/high_nicotine/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents.add_reagent(REAGENT_ID_NICOTINE, 10)
|
||||
reagents.add_reagent(REAGENT_ID_WATER, 10)
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/orange
|
||||
name = "orange flavour cartridge"
|
||||
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its orange flavored."
|
||||
/obj/item/reagent_containers/ecig_cartridge/orange/New()
|
||||
..()
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/orange/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
|
||||
reagents.add_reagent(REAGENT_ID_WATER, 10)
|
||||
reagents.add_reagent(REAGENT_ID_ORANGEJUICE, 5)
|
||||
@@ -201,8 +204,9 @@
|
||||
/obj/item/reagent_containers/ecig_cartridge/mint
|
||||
name = "mint flavour cartridge"
|
||||
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its mint flavored."
|
||||
/obj/item/reagent_containers/ecig_cartridge/mint/New()
|
||||
..()
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/mint/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
|
||||
reagents.add_reagent(REAGENT_ID_WATER, 10)
|
||||
reagents.add_reagent(REAGENT_ID_MENTHOL, 5)
|
||||
@@ -210,8 +214,8 @@
|
||||
/obj/item/reagent_containers/ecig_cartridge/watermelon
|
||||
name = "watermelon flavour cartridge"
|
||||
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its watermelon flavored."
|
||||
/obj/item/reagent_containers/ecig_cartridge/watermelon/New()
|
||||
..()
|
||||
/obj/item/reagent_containers/ecig_cartridge/watermelon/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
|
||||
reagents.add_reagent(REAGENT_ID_WATER, 10)
|
||||
reagents.add_reagent(REAGENT_ID_WATERMELONJUICE, 5)
|
||||
@@ -219,8 +223,9 @@
|
||||
/obj/item/reagent_containers/ecig_cartridge/grape
|
||||
name = "grape flavour cartridge"
|
||||
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its grape flavored."
|
||||
/obj/item/reagent_containers/ecig_cartridge/grape/New()
|
||||
..()
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/grape/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
|
||||
reagents.add_reagent(REAGENT_ID_WATER, 10)
|
||||
reagents.add_reagent(REAGENT_ID_GRAPEJUICE, 5)
|
||||
@@ -228,8 +233,9 @@
|
||||
/obj/item/reagent_containers/ecig_cartridge/lemonlime
|
||||
name = "lemon-lime flavour cartridge"
|
||||
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its lemon-lime flavored."
|
||||
/obj/item/reagent_containers/ecig_cartridge/lemonlime/New()
|
||||
..()
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/lemonlime/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
|
||||
reagents.add_reagent(REAGENT_ID_WATER, 10)
|
||||
reagents.add_reagent(REAGENT_ID_LEMONLIME, 5)
|
||||
@@ -237,8 +243,9 @@
|
||||
/obj/item/reagent_containers/ecig_cartridge/coffee
|
||||
name = "coffee flavour cartridge"
|
||||
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its coffee flavored."
|
||||
/obj/item/reagent_containers/ecig_cartridge/coffee/New()
|
||||
..()
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/coffee/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
|
||||
reagents.add_reagent(REAGENT_ID_WATER, 10)
|
||||
reagents.add_reagent(REAGENT_ID_COFFEE, 5)
|
||||
@@ -246,8 +253,9 @@
|
||||
/obj/item/reagent_containers/ecig_cartridge/cannabis
|
||||
name = "herb flavour cartridge"
|
||||
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label seems to be suspiciously scuffed off..."
|
||||
/obj/item/reagent_containers/ecig_cartridge/cannabis/New()
|
||||
..()
|
||||
|
||||
/obj/item/reagent_containers/ecig_cartridge/cannabis/Initialize(mapload)
|
||||
. = ..()
|
||||
reagents.add_reagent(REAGENT_ID_NICOTINE, 5)
|
||||
reagents.add_reagent(REAGENT_ID_WATER, 10)
|
||||
reagents.add_reagent("cannabis", 5)
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
var/blast_light = 2
|
||||
var/blast_flash = 3
|
||||
|
||||
/obj/item/plastique/New()
|
||||
/obj/item/plastique/Initialize(mapload)
|
||||
. = ..()
|
||||
wires = new(src)
|
||||
image_overlay = image('icons/obj/assemblies.dmi', "plastic-explosive2")
|
||||
..()
|
||||
|
||||
/obj/item/plastique/Destroy()
|
||||
qdel(wires)
|
||||
|
||||
@@ -138,8 +138,8 @@
|
||||
can_repeat = FALSE
|
||||
banglet = TRUE
|
||||
|
||||
/obj/item/grenade/flashbang/clusterbang/segment/New()//Segments should never exist except part of the clusterbang, since these immediately 'do their thing' and asplode
|
||||
..()
|
||||
/obj/item/grenade/flashbang/clusterbang/segment/Initialize(mapload) //Segments should never exist except part of the clusterbang, since these immediately 'do their thing' and asplode
|
||||
. = ..()
|
||||
|
||||
icon_state = "clusterbang_segment_active"
|
||||
|
||||
@@ -147,15 +147,13 @@
|
||||
var/temploc = src.loc//Saves the current location to know where to step away from
|
||||
walk_away(src,temploc,stepdist)//I must go, my people need me
|
||||
|
||||
var/dettime = rand(15,60)
|
||||
spawn(dettime)
|
||||
detonate()
|
||||
addtimer(CALLBACK(src, PROC_REF(detonate)), rand(15, 60), TIMER_DELETE_ME)
|
||||
|
||||
/obj/item/grenade/flashbang/cluster
|
||||
banglet = TRUE
|
||||
|
||||
/obj/item/grenade/flashbang/cluster/New()//Same concept as the segments, so that all of the parts don't become reliant on the clusterbang
|
||||
..()
|
||||
/obj/item/grenade/flashbang/cluster/Initialize(mapload)//Same concept as the segments, so that all of the parts don't become reliant on the clusterbang
|
||||
. = ..()
|
||||
|
||||
icon_state = "flashbang_active"
|
||||
|
||||
@@ -163,6 +161,4 @@
|
||||
var/temploc = src.loc
|
||||
walk_away(src,temploc,stepdist)
|
||||
|
||||
var/dettime = rand(15,60)
|
||||
spawn(dettime)
|
||||
detonate()
|
||||
addtimer(CALLBACK(src, PROC_REF(detonate)), rand(15, 60), TIMER_DELETE_ME)
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
drop_sound = 'sound/items/drop/card.ogg'
|
||||
pickup_sound = 'sound/items/pickup/card.ogg'
|
||||
|
||||
/obj/item/card/New()
|
||||
/obj/item/card/Initialize(mapload)
|
||||
. = ..()
|
||||
reset_icon()
|
||||
|
||||
@@ -299,4 +299,4 @@
|
||||
UnregisterSignal(src, COMSIG_OBSERVER_MOVED)
|
||||
R = null
|
||||
last_robot_loc = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
@@ -129,11 +129,10 @@
|
||||
'Ignore' - keywords in the speech won't have any effect.
|
||||
'Implant-toggle' - toggles implant."}
|
||||
|
||||
/obj/item/implanter/sizecontrol/New()
|
||||
/obj/item/implanter/sizecontrol/Initialize(mapload)
|
||||
. = ..()
|
||||
src.imp = new /obj/item/implant/sizecontrol( src )
|
||||
..()
|
||||
update()
|
||||
return
|
||||
|
||||
|
||||
//////////////////////////////
|
||||
@@ -154,11 +153,10 @@ Due to the small chemical capacity of the implant, the life of the implant is re
|
||||
safeties to prevent lethal or actively harmful commands from being input to lessen the severity of the crime if they are caught. This one has a golden stamp \
|
||||
with the shape of a star on it, the letters 'KE' in black text on it."
|
||||
|
||||
/obj/item/implanter/compliance/New()
|
||||
src.imp = new /obj/item/implant/compliance( src )
|
||||
..()
|
||||
/obj/item/implanter/compliance/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/compliance(src)
|
||||
update()
|
||||
return
|
||||
|
||||
/obj/item/implanter/compliance/attack_self(mob/user)
|
||||
if(istype(imp,/obj/item/implant/compliance))
|
||||
|
||||
@@ -12,51 +12,51 @@
|
||||
var/obj/item/implant/imp = null
|
||||
|
||||
/obj/item/implantcase/proc/update()
|
||||
if (src.imp)
|
||||
src.icon_state = text("implantcase-[]", src.imp.implant_color)
|
||||
if (imp)
|
||||
icon_state = text("implantcase-[]", imp.implant_color)
|
||||
else
|
||||
src.icon_state = "implantcase-0"
|
||||
icon_state = "implantcase-0"
|
||||
return
|
||||
|
||||
/obj/item/implantcase/attackby(obj/item/I as obj, mob/user as mob)
|
||||
..()
|
||||
if (istype(I, /obj/item/pen))
|
||||
var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", src.name), null, MAX_NAME_LEN)
|
||||
var/t = tgui_input_text(user, "What would you like the label to be?", text("[]", name), null, MAX_NAME_LEN)
|
||||
if (user.get_active_hand() != I)
|
||||
return
|
||||
if((!in_range(src, user) && src.loc != user))
|
||||
if((!in_range(src, user) && loc != user))
|
||||
return
|
||||
t = sanitizeSafe(t, MAX_NAME_LEN)
|
||||
if(t)
|
||||
src.name = text("Glass Case - '[]'", t)
|
||||
name = text("Glass Case - '[]'", t)
|
||||
else
|
||||
src.name = "Glass Case"
|
||||
name = "Glass Case"
|
||||
else if(istype(I, /obj/item/reagent_containers/syringe))
|
||||
if(!src.imp) return
|
||||
if(!src.imp.allow_reagents) return
|
||||
if(src.imp.reagents.total_volume >= src.imp.reagents.maximum_volume)
|
||||
if(!imp) return
|
||||
if(!imp.allow_reagents) return
|
||||
if(imp.reagents.total_volume >= imp.reagents.maximum_volume)
|
||||
to_chat(user, span_warning("\The [src] is full."))
|
||||
else
|
||||
spawn(5)
|
||||
I.reagents.trans_to_obj(src.imp, 5)
|
||||
I.reagents.trans_to_obj(imp, 5)
|
||||
to_chat(user, span_notice("You inject 5 units of the solution. The syringe now contains [I.reagents.total_volume] units."))
|
||||
else if (istype(I, /obj/item/implanter))
|
||||
var/obj/item/implanter/M = I
|
||||
if (M.imp)
|
||||
if ((src.imp || M.imp.implanted))
|
||||
if ((imp || M.imp.implanted))
|
||||
return
|
||||
M.imp.loc = src
|
||||
src.imp = M.imp
|
||||
imp = M.imp
|
||||
M.imp = null
|
||||
src.update()
|
||||
update()
|
||||
M.update()
|
||||
else
|
||||
if (src.imp)
|
||||
if (imp)
|
||||
if (M.imp)
|
||||
return
|
||||
src.imp.loc = M
|
||||
M.imp = src.imp
|
||||
src.imp = null
|
||||
imp.loc = M
|
||||
M.imp = imp
|
||||
imp = null
|
||||
update()
|
||||
M.update()
|
||||
return
|
||||
@@ -67,10 +67,9 @@
|
||||
desc = "A case containing a tracking implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/tracking/New()
|
||||
src.imp = new /obj/item/implant/tracking( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/tracking/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/tracking(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/explosive
|
||||
@@ -78,10 +77,9 @@
|
||||
desc = "A case containing an explosive implant."
|
||||
icon_state = "implantcase-r"
|
||||
|
||||
/obj/item/implantcase/explosive/New()
|
||||
src.imp = new /obj/item/implant/explosive( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/explosive/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/explosive(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/chem
|
||||
@@ -89,10 +87,9 @@
|
||||
desc = "A case containing a chemical implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/chem/New()
|
||||
src.imp = new /obj/item/implant/chem( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/chem/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/chem(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/loyalty
|
||||
@@ -100,10 +97,9 @@
|
||||
desc = "A case containing a loyalty implant."
|
||||
icon_state = "implantcase-r"
|
||||
|
||||
/obj/item/implantcase/loyalty/New()
|
||||
src.imp = new /obj/item/implant/loyalty( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/loyalty/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/loyalty(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/death_alarm
|
||||
@@ -111,10 +107,9 @@
|
||||
desc = "A case containing a death alarm implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/death_alarm/New()
|
||||
src.imp = new /obj/item/implant/death_alarm( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/death_alarm/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/death_alarm(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/freedom
|
||||
@@ -122,10 +117,9 @@
|
||||
desc = "A case containing a freedom implant."
|
||||
icon_state = "implantcase-r"
|
||||
|
||||
/obj/item/implantcase/freedom/New()
|
||||
src.imp = new /obj/item/implant/freedom( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/freedom/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/freedom(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/adrenalin
|
||||
@@ -133,10 +127,9 @@
|
||||
desc = "A case containing an adrenalin implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/adrenalin/New()
|
||||
src.imp = new /obj/item/implant/adrenalin( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/adrenalin/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/adrenalin(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/dexplosive
|
||||
@@ -144,10 +137,9 @@
|
||||
desc = "A case containing an explosive."
|
||||
icon_state = "implantcase-r"
|
||||
|
||||
/obj/item/implantcase/dexplosive/New()
|
||||
src.imp = new /obj/item/implant/dexplosive( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/dexplosive/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/dexplosive(src)
|
||||
|
||||
|
||||
/obj/item/implantcase/health
|
||||
@@ -155,157 +147,141 @@
|
||||
desc = "A case containing a health tracking implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/health/New()
|
||||
src.imp = new /obj/item/implant/health( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/health/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/health(src)
|
||||
|
||||
/obj/item/implantcase/language
|
||||
name = "glass case - 'GalCom'"
|
||||
desc = "A case containing a GalCom language implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/language/New()
|
||||
src.imp = new /obj/item/implant/language( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/language/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/language(src)
|
||||
|
||||
/obj/item/implantcase/language/eal
|
||||
name = "glass case - 'EAL'"
|
||||
desc = "A case containing an Encoded Audio Language implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/language/eal/New()
|
||||
src.imp = new /obj/item/implant/language/eal( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/language/eal/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/language/eal(src)
|
||||
|
||||
/obj/item/implantcase/shades
|
||||
name = "glass case - 'Integrated Shades'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/shades/New()
|
||||
src.imp = new /obj/item/implant/organ( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/shades/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ(src)
|
||||
|
||||
/obj/item/implantcase/taser
|
||||
name = "glass case - 'Taser'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/taser/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/taser/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment(src)
|
||||
|
||||
/obj/item/implantcase/laser
|
||||
name = "glass case - 'Laser'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/laser/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/laser( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/laser/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/laser(src)
|
||||
|
||||
/obj/item/implantcase/dart
|
||||
name = "glass case - 'Dart'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/dart/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/dart( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/dart/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/dart(src)
|
||||
|
||||
/obj/item/implantcase/toolkit
|
||||
name = "glass case - 'Toolkit'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/toolkit/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/upperarm( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/toolkit/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/upperarm(src)
|
||||
|
||||
/obj/item/implantcase/medkit
|
||||
name = "glass case - 'Toolkit'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/medkit/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/upperarm/medkit( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/medkit/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/upperarm/medkit(src)
|
||||
|
||||
/obj/item/implantcase/surge
|
||||
name = "glass case - 'Muscle Overclocker'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/surge/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/upperarm/surge( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/surge/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/upperarm/surge(src)
|
||||
|
||||
/obj/item/implantcase/analyzer
|
||||
name = "glass case - 'Scanner'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/analyzer/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/wrist( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/analyzer/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/wrist(src)
|
||||
|
||||
/obj/item/implantcase/sword
|
||||
name = "glass case - 'Scanner'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/sword/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/wrist/sword( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/sword/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/wrist/sword(src)
|
||||
|
||||
/obj/item/implantcase/sprinter
|
||||
name = "glass case - 'Sprinter'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/sprinter/New()
|
||||
src.imp = new /obj/item/implant/organ/pelvic( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/sprinter/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/pelvic(src)
|
||||
|
||||
/obj/item/implantcase/armblade
|
||||
name = "glass case - 'Armblade'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/armblade/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/upperarm/blade( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/armblade/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/upperarm/blade(src)
|
||||
|
||||
/obj/item/implantcase/handblade
|
||||
name = "glass case - 'Handblade'"
|
||||
desc = "A case containing a nanite fabricator implant."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/handblade/New()
|
||||
src.imp = new /obj/item/implant/organ/limbaugment/wrist/blade( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/handblade/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/organ/limbaugment/wrist/blade(src)
|
||||
|
||||
/obj/item/implantcase/restrainingbolt
|
||||
name = "glass case - 'Restraining Bolt'"
|
||||
desc = "A case containing a restraining bolt."
|
||||
icon_state = "implantcase-b"
|
||||
|
||||
/obj/item/implantcase/restrainingbolt/New()
|
||||
src.imp = new /obj/item/implant/restrainingbolt( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/restrainingbolt/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/restrainingbolt(src)
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
desc = "A case containing a language implant."
|
||||
icon_state = "implantcase-r"
|
||||
|
||||
/obj/item/implantcase/vrlanguage/New()
|
||||
src.imp = new /obj/item/implant/vrlanguage( src )
|
||||
..()
|
||||
return
|
||||
/obj/item/implantcase/vrlanguage/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/vrlanguage(src)
|
||||
|
||||
@@ -77,39 +77,35 @@
|
||||
/obj/item/implanter/loyalty
|
||||
name = "implanter-loyalty"
|
||||
|
||||
/obj/item/implanter/loyalty/New()
|
||||
src.imp = new /obj/item/implant/loyalty( src )
|
||||
..()
|
||||
/obj/item/implanter/loyalty/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/loyalty(src)
|
||||
update()
|
||||
return
|
||||
|
||||
/obj/item/implanter/explosive
|
||||
name = "implanter (E)"
|
||||
|
||||
/obj/item/implanter/explosive/New()
|
||||
src.imp = new /obj/item/implant/explosive( src )
|
||||
..()
|
||||
/obj/item/implanter/explosive/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/explosive(src)
|
||||
update()
|
||||
return
|
||||
|
||||
/obj/item/implanter/adrenalin
|
||||
name = "implanter-adrenalin"
|
||||
|
||||
/obj/item/implanter/adrenalin/New()
|
||||
src.imp = new /obj/item/implant/adrenalin(src)
|
||||
..()
|
||||
/obj/item/implanter/adrenalin/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/adrenalin(src)
|
||||
update()
|
||||
return
|
||||
|
||||
/obj/item/implanter/compressed
|
||||
name = "implanter (C)"
|
||||
icon_state = "cimplanter1"
|
||||
|
||||
/obj/item/implanter/compressed/New()
|
||||
imp = new /obj/item/implant/compressed( src )
|
||||
..()
|
||||
/obj/item/implanter/compressed/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/compressed(src)
|
||||
update()
|
||||
return
|
||||
|
||||
/obj/item/implanter/compressed/update()
|
||||
if (imp)
|
||||
@@ -158,8 +154,7 @@
|
||||
/obj/item/implanter/restrainingbolt
|
||||
name = "implanter (bolt)"
|
||||
|
||||
/obj/item/implanter/restrainingbolt/New()
|
||||
src.imp = new /obj/item/implant/restrainingbolt( src )
|
||||
..()
|
||||
/obj/item/implanter/restrainingbolt/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new /obj/item/implant/restrainingbolt(src)
|
||||
update()
|
||||
return
|
||||
|
||||
@@ -8,11 +8,10 @@
|
||||
var/uses = 1.0
|
||||
|
||||
|
||||
/obj/item/implant/freedom/New()
|
||||
src.activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
|
||||
src.uses = rand(1, 5)
|
||||
..()
|
||||
return
|
||||
/obj/item/implant/freedom/Initialize(mapload)
|
||||
. = ..()
|
||||
activation_emote = pick("blink", "blink_r", "eyebrow", "chuckle", "twitch", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
|
||||
uses = rand(1, 5)
|
||||
|
||||
|
||||
/obj/item/implant/freedom/trigger(emote, mob/living/carbon/source as mob)
|
||||
|
||||
@@ -17,18 +17,17 @@
|
||||
var/verb_name = "Transfer From Reagent Implant"
|
||||
var/verb_desc = "Remove reagents from an internal reagent into a container"
|
||||
|
||||
/obj/item/implant/reagent_generator/New()
|
||||
..()
|
||||
/obj/item/implant/reagent_generator/Initialize(mapload)
|
||||
. = ..()
|
||||
create_reagents(usable_volume)
|
||||
|
||||
/obj/item/implanter/reagent_generator
|
||||
var/implant_type = /obj/item/implant/reagent_generator
|
||||
|
||||
/obj/item/implanter/reagent_generator/New()
|
||||
..()
|
||||
/obj/item/implanter/reagent_generator/Initialize(mapload)
|
||||
. = ..()
|
||||
imp = new implant_type(src)
|
||||
update()
|
||||
return
|
||||
|
||||
/obj/item/implant/reagent_generator/post_implant(mob/living/carbon/source)
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
@@ -257,12 +257,13 @@
|
||||
|
||||
var/mob/living/carbon/human/hume
|
||||
|
||||
/obj/item/cell/standin/New(newloc, var/mob/living/carbon/human/H)
|
||||
..()
|
||||
if(istype(H, /mob/living/carbon/human))//ChompEDIT - fix a runtime
|
||||
hume = H
|
||||
charge = H.nutrition
|
||||
maxcharge = initial(H.nutrition)
|
||||
/obj/item/cell/standin/Initialize(mapload, var/mob/living/carbon/human/H)
|
||||
if(!istype(H))
|
||||
return INITIALIZE_HINT_QDEL
|
||||
. = ..()
|
||||
hume = H
|
||||
charge = H.nutrition
|
||||
maxcharge = initial(H.nutrition)
|
||||
|
||||
QDEL_IN(src, 20 SECONDS)
|
||||
|
||||
|
||||
@@ -28,14 +28,13 @@
|
||||
var/drops_debris = 1
|
||||
var/named_from_material = 1 //YW EDIT, Does it prepend the material's name to it's name?
|
||||
|
||||
/obj/item/material/New(var/newloc, var/material_key)
|
||||
..(newloc)
|
||||
/obj/item/material/Initialize(mapload, var/material_key)
|
||||
. = ..()
|
||||
if(!material_key)
|
||||
material_key = default_material
|
||||
set_material(material_key)
|
||||
if(!material)
|
||||
qdel(src)
|
||||
return
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
matter = material.get_matter()
|
||||
if(matter.len)
|
||||
|
||||
@@ -143,8 +143,8 @@
|
||||
return
|
||||
|
||||
// Preset types - left here for the code that uses them
|
||||
/obj/item/material/shard/shrapnel/New(loc)
|
||||
..(loc, MAT_STEEL)
|
||||
/obj/item/material/shard/shrapnel/Initialize(mapload)
|
||||
. = ..(mapload, MAT_STEEL)
|
||||
|
||||
/obj/item/material/shard/phoron/New(loc)
|
||||
..(loc, MAT_PGLASS)
|
||||
/obj/item/material/shard/phoron/Initialize(mapload)
|
||||
. = ..(mapload, MAT_PGLASS)
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
sharp = TRUE
|
||||
edge = TRUE
|
||||
|
||||
/obj/item/material/star/New()
|
||||
..()
|
||||
src.pixel_x = rand(-12, 12)
|
||||
src.pixel_y = rand(-12, 12)
|
||||
/obj/item/material/star/Initialize(mapload)
|
||||
. = ..()
|
||||
pixel_x = rand(-12, 12)
|
||||
pixel_y = rand(-12, 12)
|
||||
|
||||
/obj/item/material/star/throw_impact(atom/hit_atom)
|
||||
..()
|
||||
|
||||
@@ -56,8 +56,8 @@
|
||||
throwforce = round(force*thrown_force_divisor)
|
||||
//to_world("[src] has unwielded force [force_unwielded], wielded force [force_wielded] and throwforce [throwforce] when made from default material [material.name]")
|
||||
|
||||
/obj/item/material/twohanded/New()
|
||||
..()
|
||||
/obj/item/material/twohanded/Initialize(mapload)
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
//Allow a small chance of parrying melee attacks when wielded - maybe generalize this to other weapons someday
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
. = ..()
|
||||
. += "There [uses == 1 ? "is" : "are"] [uses] [material] [uses == 1 ? src.material.sheet_singular_name : src.material.sheet_plural_name] left for use."
|
||||
|
||||
/obj/item/material/sharpeningkit/New()
|
||||
/obj/item/material/sharpeningkit/Initialize(mapload)
|
||||
. = ..()
|
||||
setrepair()
|
||||
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
var/open = FALSE
|
||||
|
||||
/obj/item/melee/umbrella/New()
|
||||
..()
|
||||
/obj/item/melee/umbrella/Initialize(mapload)
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
/obj/item/melee/umbrella/attack_self()
|
||||
@@ -56,9 +56,9 @@
|
||||
H.update_inv_r_hand()
|
||||
|
||||
// Randomizes color
|
||||
/obj/item/melee/umbrella/random/New()
|
||||
/obj/item/melee/umbrella/random/Initialize(mapload)
|
||||
. = ..()
|
||||
color = get_random_colour()
|
||||
..()
|
||||
|
||||
/obj/item/melee/cursedblade
|
||||
name = "crystal blade"
|
||||
|
||||
@@ -71,10 +71,9 @@
|
||||
update_icon()
|
||||
..()
|
||||
|
||||
/obj/item/melee/shock_maul/Initialize() //CHOMPedit
|
||||
..()
|
||||
/obj/item/melee/shock_maul/Initialize(mapload)
|
||||
. = ..()
|
||||
update_held_icon()
|
||||
return
|
||||
|
||||
/obj/item/melee/shock_maul/get_cell()
|
||||
return bcell
|
||||
@@ -111,11 +110,10 @@
|
||||
usr.put_in_l_hand(src)
|
||||
src.add_fingerprint(usr)
|
||||
|
||||
/obj/item/melee/shock_maul/loaded/New() //this one starts with a cell pre-installed.
|
||||
..()
|
||||
/obj/item/melee/shock_maul/loaded/Initialize(mapload) //this one starts with a cell pre-installed.
|
||||
. = ..()
|
||||
bcell = new/obj/item/cell/device/weapon(src)
|
||||
update_icon()
|
||||
return
|
||||
|
||||
/obj/item/melee/shock_maul/proc/deductcharge()
|
||||
if(status == 1) //Only deducts charge when it's on
|
||||
|
||||
@@ -18,9 +18,9 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop)
|
||||
var/mopping = 0
|
||||
var/mopcount = 0
|
||||
|
||||
/obj/item/mop/New()
|
||||
/obj/item/mop/Initialize(mapload)
|
||||
. = ..()
|
||||
create_reagents(30)
|
||||
..()
|
||||
|
||||
/obj/item/mop/afterattack(atom/A, mob/user, proximity)
|
||||
if(!proximity) return
|
||||
@@ -59,9 +59,9 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop)
|
||||
flags = NOCONDUCT
|
||||
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
|
||||
|
||||
/obj/item/mop/advanced/New()
|
||||
/obj/item/mop/advanced/Initialize(mapload)
|
||||
. = ..()
|
||||
create_reagents(30)
|
||||
..()
|
||||
|
||||
/obj/item/mop/advanced/afterattack(atom/A, mob/user, proximity)
|
||||
if(!proximity) return
|
||||
|
||||
@@ -15,7 +15,8 @@
|
||||
var/mopcount = 0
|
||||
|
||||
|
||||
/obj/item/mop_deploy/New()
|
||||
/obj/item/mop_deploy/Initialize(mapload)
|
||||
. = ..()
|
||||
create_reagents(5)
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
|
||||
@@ -53,8 +53,8 @@ var/list/tape_roll_applications = list()
|
||||
icon_state = "[icon_base]_dir_[crumpled]"
|
||||
dir = tape_dir
|
||||
|
||||
/obj/item/tape/New()
|
||||
..()
|
||||
/obj/item/tape/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!hazard_overlays)
|
||||
hazard_overlays = list()
|
||||
hazard_overlays["[NORTH]"] = new/image('icons/effects/warning_stripes.dmi', icon_state = "N")
|
||||
|
||||
@@ -91,7 +91,8 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
|
||||
desc = "To be applied to the head repeatedly."
|
||||
icon_state ="bible"
|
||||
|
||||
/obj/item/storage/bible/booze/New()
|
||||
/obj/item/storage/bible/booze/Initialize(mapload)
|
||||
. = ..()
|
||||
starts_with = list(
|
||||
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
|
||||
/obj/item/reagent_containers/food/drinks/bottle/small/beer,
|
||||
|
||||
@@ -61,12 +61,12 @@
|
||||
)
|
||||
starts_with = list(/obj/item/reagent_containers/food/snacks/egg = 12)
|
||||
|
||||
/obj/item/storage/fancy/egg_box/New()
|
||||
/obj/item/storage/fancy/egg_box/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!open_state)
|
||||
open_state = "[initial(icon_state)]0"
|
||||
if(!closed_state)
|
||||
closed_state = "[initial(icon_state)]"
|
||||
..()
|
||||
|
||||
/obj/item/storage/fancy/egg_box/update_icon()
|
||||
cut_overlays()
|
||||
@@ -263,12 +263,12 @@
|
||||
C.brand = brand
|
||||
C.desc += " This one is \a [brand]."
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/New()
|
||||
/obj/item/storage/fancy/cigarettes/Initialize()
|
||||
. = ..()
|
||||
if(!open_state)
|
||||
open_state = "[initial(icon_state)]_open"
|
||||
if(!closed_state)
|
||||
closed_state = "[initial(icon_state)]"
|
||||
..()
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/update_icon()
|
||||
cut_overlays()
|
||||
@@ -410,12 +410,12 @@
|
||||
reagents.trans_to_obj(C, (reagents.total_volume/contents.len))
|
||||
return ..()
|
||||
|
||||
/obj/item/storage/fancy/cigar/New()
|
||||
/obj/item/storage/fancy/cigar/Initialize()
|
||||
. = ..()
|
||||
if(!open_state)
|
||||
open_state = "[initial(icon_state)]0"
|
||||
if(!closed_state)
|
||||
closed_state = "[initial(icon_state)]"
|
||||
..()
|
||||
|
||||
/obj/item/storage/fancy/cigar/update_icon()
|
||||
cut_overlays()
|
||||
|
||||
@@ -4,12 +4,13 @@
|
||||
preserve_item = 1
|
||||
var/obj/item/master_item
|
||||
|
||||
/obj/item/storage/internal/New(obj/item/MI)
|
||||
master_item = MI
|
||||
loc = master_item
|
||||
/obj/item/storage/internal/Initialize(mapload)
|
||||
. = ..()
|
||||
master_item = loc
|
||||
if(!istype(master_item))
|
||||
return INITIALIZE_HINT_QDEL
|
||||
name = master_item.name
|
||||
verbs -= /obj/item/verb/verb_pickup //make sure this is never picked up.
|
||||
..()
|
||||
|
||||
/obj/item/storage/internal/Destroy()
|
||||
master_item = null
|
||||
|
||||
@@ -822,12 +822,12 @@
|
||||
else
|
||||
icon_state = closed_state
|
||||
|
||||
/obj/item/storage/trinketbox/New()
|
||||
/obj/item/storage/trinketbox/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!open_state)
|
||||
open_state = "[initial(icon_state)]_open"
|
||||
if(!closed_state)
|
||||
closed_state = "[initial(icon_state)]"
|
||||
..()
|
||||
|
||||
/obj/item/storage/trinketbox/attack_self()
|
||||
open = !open
|
||||
@@ -862,14 +862,15 @@
|
||||
alpha = 200
|
||||
var/datum/weakref/held_item
|
||||
|
||||
/atom/movable/storage_slot/New(newloc, obj/item/held_item)
|
||||
/atom/movable/storage_slot/Initialize(mapload, obj/item/held_item)
|
||||
. = ..()
|
||||
ASSERT(held_item)
|
||||
name += held_item.name
|
||||
src.held_item = WEAKREF(held_item)
|
||||
|
||||
/atom/movable/storage_slot/Destroy()
|
||||
held_item = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/// Has to be this way. The fact that the overlays will be constantly mutated by other storage means we can't wait.
|
||||
/atom/movable/storage_slot/add_overlay(list/somethings)
|
||||
|
||||
@@ -87,8 +87,8 @@
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/item/storage/wallet/random/New()
|
||||
..()
|
||||
/obj/item/storage/wallet/random/Initialize(mapload)
|
||||
. = ..()
|
||||
var/amount = rand(50, 100) + rand(50, 100) // Triangular distribution from 100 to 200
|
||||
var/obj/item/spacecash/SC = null
|
||||
SC = new(src)
|
||||
@@ -105,9 +105,9 @@
|
||||
desc = "You can recolor it! Fancy! The future is NOW!"
|
||||
icon_state = "wallet-white"
|
||||
|
||||
/obj/item/storage/wallet/poly/New()
|
||||
..()
|
||||
verbs |= /obj/item/storage/wallet/poly/proc/change_color
|
||||
/obj/item/storage/wallet/poly/Initialize(mapload)
|
||||
. = ..()
|
||||
verbs += /obj/item/storage/wallet/poly/proc/change_color
|
||||
color = get_random_colour()
|
||||
update_icon()
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
var/volume_rate = 500 //Needed for borg jetpack transfer
|
||||
actions_types = list(/datum/action/item_action/toggle_jetpack)
|
||||
|
||||
/obj/item/tank/jetpack/New()
|
||||
..()
|
||||
/obj/item/tank/jetpack/Initialize()
|
||||
. = ..()
|
||||
ion_trail = new /datum/effect/effect/system/ion_trail_follow()
|
||||
ion_trail.set_up(src)
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
gauge_cap = 3
|
||||
volume = 12 // CHOMP EDIT double extended
|
||||
|
||||
/obj/item/tank/emergency/phoron/double/Initialize() //ChompEDIT New() -> Initialize()
|
||||
/obj/item/tank/emergency/phoron/double/Initialize()
|
||||
. = ..()
|
||||
air_contents.adjust_gas(GAS_PHORON, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
|
||||
|
||||
|
||||
@@ -119,13 +119,10 @@
|
||||
plane = MOB_PLANE
|
||||
anchored = FALSE
|
||||
drop_sound = null
|
||||
flags = NOBLUDGEON
|
||||
|
||||
var/obj/item/stuck = null
|
||||
|
||||
/obj/item/ducttape/New()
|
||||
..()
|
||||
flags |= NOBLUDGEON
|
||||
|
||||
/obj/item/ducttape/examine(mob/user)
|
||||
SHOULD_CALL_PARENT(FALSE)
|
||||
return stuck.examine(user)
|
||||
|
||||
@@ -31,8 +31,8 @@
|
||||
for(var/obj/item/tool in tools)
|
||||
. += "[icon2html(tool,)] - [tool.name][tools[current_tool]==tool?" (selected)":""]")
|
||||
|
||||
/obj/item/combitool/New()
|
||||
..()
|
||||
/obj/item/combitool/Initialize(mapload)
|
||||
. = ..()
|
||||
for(var/type in spawn_tools)
|
||||
tools |= new type(src)
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@
|
||||
item_state = "crowbar_red"
|
||||
random_color = FALSE
|
||||
|
||||
/obj/item/tool/prybar/New()
|
||||
/obj/item/tool/prybar/Initialize(mapload)
|
||||
. = ..()
|
||||
if(random_color)
|
||||
icon_state = "prybar[pick("","_green","_aubergine","_blue")]"
|
||||
. = ..()
|
||||
|
||||
@@ -26,7 +26,8 @@
|
||||
tool_qualities = list(TOOL_SCREWDRIVER)
|
||||
var/random_color = TRUE
|
||||
|
||||
/obj/item/tool/screwdriver/New()
|
||||
/obj/item/tool/screwdriver/Initialize(mapload)
|
||||
. = ..()
|
||||
if(random_color)
|
||||
switch(pick("red","blue","purple","brown","green","cyan","yellow"))
|
||||
if ("red")
|
||||
@@ -52,8 +53,7 @@
|
||||
item_state = "screwdriver_yellow"
|
||||
|
||||
if (prob(75))
|
||||
src.pixel_y = rand(0, 16)
|
||||
..()
|
||||
pixel_y = rand(0, 16)
|
||||
|
||||
/obj/item/tool/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
|
||||
if(!istype(M) || user.a_intent == I_HELP)
|
||||
|
||||
@@ -28,7 +28,8 @@
|
||||
tool_qualities = list(TOOL_WIRECUTTER)
|
||||
var/random_color = TRUE
|
||||
|
||||
/obj/item/tool/wirecutters/New()
|
||||
/obj/item/tool/wirecutters/Initialize(mapload)
|
||||
. = ..()
|
||||
if(random_color)
|
||||
switch(pick("red","blue","yellow"))
|
||||
if ("red")
|
||||
@@ -42,8 +43,7 @@
|
||||
item_state = "cutters_yellow"
|
||||
|
||||
if (prob(75))
|
||||
src.pixel_y = rand(0, 16)
|
||||
..()
|
||||
pixel_y = rand(0, 16)
|
||||
|
||||
/obj/item/tool/wirecutters/attack(mob/living/carbon/C as mob, mob/user as mob)
|
||||
if(istype(C) && user.a_intent == I_HELP && (C.handcuffed) && (istype(C.handcuffed, /obj/item/handcuffs/cable)))
|
||||
|
||||
@@ -29,6 +29,6 @@
|
||||
else if(user.fire_stacks < 0)
|
||||
user.fire_stacks = (min(0, user.fire_stacks + 1.5))
|
||||
|
||||
/obj/item/towel/random/New()
|
||||
..()
|
||||
/obj/item/towel/random/Initialize(mapload)
|
||||
. = ..()
|
||||
color = get_random_colour()
|
||||
|
||||
@@ -20,12 +20,9 @@ var/global/list/micro_tunnels = list()
|
||||
/mob/living/simple_mob/slime
|
||||
)
|
||||
|
||||
/obj/structure/micro_tunnel/New()
|
||||
. = ..()
|
||||
micro_tunnels.Add(src)
|
||||
|
||||
/obj/structure/micro_tunnel/Initialize()
|
||||
. = ..()
|
||||
micro_tunnels.Add(src)
|
||||
if(name == initial(name))
|
||||
var/area/our_area = get_area(src)
|
||||
name = "[our_area.name] [name]"
|
||||
|
||||
@@ -27,8 +27,8 @@
|
||||
else
|
||||
. += "It says '[icon_state]'"
|
||||
|
||||
/obj/structure/sign/double/barsign/New()
|
||||
..()
|
||||
/obj/structure/sign/double/barsign/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_state = pick(get_valid_states())
|
||||
|
||||
/obj/structure/sign/double/barsign/attackby(obj/item/I, mob/user)
|
||||
|
||||
Reference in New Issue
Block a user