some more new to init (#17231)

* some more new to init

* rigs

* rigs

* intellisense moment

* telcoms and landmarks

* fix that as well

* some more minor things

* re add missing message

* fix trash eating...
This commit is contained in:
Kashargul
2025-03-01 19:39:52 +01:00
committed by GitHub
parent e6afc35d22
commit 4f8e9f7ef8
117 changed files with 570 additions and 643 deletions
+2 -2
View File
@@ -6,8 +6,8 @@
icon = 'icons/effects/effects.dmi'
icon_state = "dirt"
/obj/effect/decal/cleanable/chemcoating/New()
..()
/obj/effect/decal/cleanable/chemcoating/Initialize()
. = ..()
create_reagents(100)
/obj/effect/decal/cleanable/chemcoating/Initialize()
+2 -2
View File
@@ -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()
+78 -97
View File
@@ -8,46 +8,38 @@
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
// delete_me = TRUE
if("JoinLateGateway")
latejoin_gateway += loc
latejoin += src //VOREStation Addition
// delete_me = 1
return
// delete_me = TRUE
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")
@@ -60,39 +52,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
@@ -108,16 +88,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
@@ -125,8 +105,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
@@ -140,79 +121,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)
@@ -221,71 +203,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)
..()
+3 -3
View File
@@ -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