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 13:39:52 -05:00
committed by GitHub
parent e6afc35d22
commit 4f8e9f7ef8
117 changed files with 570 additions and 643 deletions
@@ -109,8 +109,8 @@
return
..()
/obj/item/rig_module/New()
..()
/obj/item/rig_module/Initialize(mapload)
. = ..()
if(suit_overlay_inactive)
suit_overlay = suit_overlay_inactive
@@ -239,9 +239,11 @@
var/module_mode = ""
var/obj/item/rig_module/module
/stat_rig_module/New(var/obj/item/rig_module/module)
..()
src.module = module
/stat_rig_module/Initialize(mapload)
. = ..()
module = loc
if(!istype(module))
return INITIALIZE_HINT_QDEL
/stat_rig_module/Destroy()
module = null
@@ -275,8 +277,10 @@
/stat_rig_module/DblClick()
return Click()
/stat_rig_module/activate/New(var/obj/item/rig_module/module)
..()
/stat_rig_module/activate/Initialize(mapload)
. = ..()
if(!istype(module))
return INITIALIZE_HINT_QDEL
name = module.activate_string
if(module.active_power_cost)
name += " ([module.active_power_cost*10]A)"
@@ -285,8 +289,10 @@
/stat_rig_module/activate/CanUse()
return module.toggleable && !module.active
/stat_rig_module/deactivate/New(var/obj/item/rig_module/module)
..()
/stat_rig_module/deactivate/Initialize(mapload)
. = ..()
if(!istype(module))
return INITIALIZE_HINT_QDEL
name = module.deactivate_string
// Show cost despite being 0, if it means changing from an active cost.
if(module.active_power_cost || module.passive_power_cost)
@@ -297,8 +303,10 @@
/stat_rig_module/deactivate/CanUse()
return module.toggleable && module.active
/stat_rig_module/engage/New(var/obj/item/rig_module/module)
..()
/stat_rig_module/engage/Initialize(mapload)
. = ..()
if(!istype(module))
return INITIALIZE_HINT_QDEL
name = module.engage_string
if(module.use_power_cost)
name += " ([module.use_power_cost*10]E)"
@@ -307,8 +315,8 @@
/stat_rig_module/engage/CanUse()
return module.usable
/stat_rig_module/select/New()
..()
/stat_rig_module/select/Initialize(mapload)
. = ..()
name = "Select"
module_mode = "select"
@@ -318,8 +326,8 @@
return 1
return 0
/stat_rig_module/charge/New()
..()
/stat_rig_module/charge/Initialize(mapload)
. = ..()
name = "Change Charge"
module_mode = "select_charge_type"
@@ -14,8 +14,8 @@
interface_desc = "An induction-powered high-throughput datalink suitable for hacking encrypted networks."
var/list/stored_research
/obj/item/rig_module/datajack/New()
..()
/obj/item/rig_module/datajack/Initialize(mapload)
. = ..()
stored_research = list()
/obj/item/rig_module/datajack/engage(atom/target)
@@ -9,8 +9,8 @@
var/device_type
var/obj/item/device
/obj/item/rig_module/device/New()
..()
/obj/item/rig_module/device/Initialize(mapload)
. = ..()
if(device_type) device = new device_type(src)
/obj/item/rig_module/device/engage(atom/target)
@@ -156,8 +156,8 @@
var/iastamp
var/deniedstamp
/obj/item/rig_module/device/stamp/New()
..()
/obj/item/rig_module/device/stamp/Initialize(mapload)
. = ..()
iastamp = new /obj/item/stamp/internalaffairs(src)
deniedstamp = new /obj/item/stamp/denied(src)
device = iastamp
@@ -51,8 +51,8 @@
jets.toggle()
return 1
/obj/item/rig_module/maneuvering_jets/New()
..()
/obj/item/rig_module/maneuvering_jets/Initialize(mapload)
. = ..()
jets = new(src)
/obj/item/rig_module/maneuvering_jets/installed()
@@ -63,4 +63,4 @@
/obj/item/rig_module/maneuvering_jets/removed()
..()
jets.holder = null
jets.ion_trail.set_up(jets)
jets.ion_trail.set_up(jets)
@@ -15,8 +15,8 @@
var/gun_type = /obj/item/gun/energy/lasercannon/mounted
var/obj/item/gun/gun
/obj/item/rig_module/mounted/New()
..()
/obj/item/rig_module/mounted/Initialize(mapload)
. = ..()
gun = new gun_type(src)
/obj/item/rig_module/mounted/engage(atom/target)
@@ -14,10 +14,10 @@
interface_name = "dead man's switch"
interface_desc = "An integrated self-destruct module. When the wearer dies, they vanish in smoke. Do not press this button."
/obj/item/rig_module/self_destruct/New()
..()
src.smoke = new /datum/effect/effect/system/smoke_spread/bad()
src.smoke.attach(src)
/obj/item/rig_module/self_destruct/Initialize(mapload)
. = ..()
smoke = new /datum/effect/effect/system/smoke_spread/bad()
smoke.attach(src)
/obj/item/rig_module/self_destruct/Destroy()
qdel(smoke)
@@ -220,8 +220,8 @@
if((. = ..()) && holder.wearer)
holder.wearer.recalculate_vis()
/obj/item/rig_module/vision/New()
..()
/obj/item/rig_module/vision/Initialize(mapload)
. = ..()
if(!vision_modes)
return
@@ -15,8 +15,8 @@
var/obj/item/voice_changer/voice_holder
/obj/item/rig_module/voice/New()
..()
/obj/item/rig_module/voice/Initialize(mapload)
. = ..()
voice_holder = new(src)
voice_holder.active = 0
@@ -107,8 +107,8 @@
device_type = /obj/item/pickaxe/excavationdrill
/obj/item/rig_module/device/New()
..()
/obj/item/rig_module/device/Initialize(mapload)
. = ..()
if(device_type) device = new device_type(src)
/obj/item/rig_module/device/engage(atom/target)
@@ -307,8 +307,8 @@
var/obj/item/voice_changer/voice_holder
/obj/item/rig_module/voice/New()
..()
/obj/item/rig_module/voice/Initialize(mapload)
. = ..()
voice_holder = new(src)
voice_holder.active = 0
@@ -396,8 +396,8 @@
jets.toggle()
return 1
/obj/item/rig_module/maneuvering_jets/New()
..()
/obj/item/rig_module/maneuvering_jets/Initialize(mapload)
. = ..()
jets = new(src)
/obj/item/rig_module/maneuvering_jets/installed()
@@ -584,8 +584,8 @@
var/iastamp
var/deniedstamp
/obj/item/rig_module/device/stamp/New()
..()
/obj/item/rig_module/device/stamp/Initialize(mapload)
. = ..()
iastamp = new /obj/item/stamp/internalaffairs(src)
deniedstamp = new /obj/item/stamp/denied(src)
device = iastamp
@@ -227,8 +227,8 @@
if((. = ..()) && holder.wearer)
holder.wearer.recalculate_vis()
/obj/item/rig_module/vision/New()
..()
/obj/item/rig_module/vision/Initialize(mapload)
. = ..()
if(!vision_modes)
return
+2 -2
View File
@@ -105,8 +105,8 @@
var/obj/item/storage/backpack/rig_storage
permeability_coefficient = 0 //Protect the squishies, after all this shit should be waterproof.
/obj/item/rig/New()
..()
/obj/item/rig/Initialize(mapload)
. = ..()
suit_state = icon_state
item_state = icon_state
@@ -2,8 +2,8 @@
description_info = "This pipe, and all other pipes, can be connected or disconnected by a wrench. The internal pressure of the pipe must \
be less than 200 kPa above the ambient pressure to do this. More pipes can be obtained from the pipe dispenser."
/obj/machinery/atmospherics/pipe/New() //This is needed or else 20+ lines of copypasta to dance around inheritence.
..()
/obj/machinery/atmospherics/pipe/Initialize() //This is needed or else 20+ lines of copypasta to dance around inheritence.
. = ..()
description_info += "<br>Most pipes and atmospheric devices can be connected or disconnected with a wrench. The pipe's pressure must not be too high, \
or if it is a device, it must be turned off first."
@@ -164,4 +164,3 @@
/obj/machinery/pipedispenser
description_info = "This can be moved by using a wrench. You will need to wrench it again when you want to use it. You can put \
excess (atmospheric) pipes into the dispenser, as well. The dispenser requires electricity to function."
+3 -3
View File
@@ -50,12 +50,12 @@
icon = 'icons/obj/seeds.dmi'
icon_state = "blank"
/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/New(var/newloc,var/datum/seed/newseed)
/obj/machinery/portable_atmospherics/hydroponics/soil/invisible/Initialize(mapload,var/datum/seed/newseed)
//VOREStation Addition Start
if(istype(loc, /turf/simulated/open) || istype(loc, /turf/space))
qdel(src)
return INITIALIZE_HINT_QDEL
//VOREStation Addition End
..()
. = ..()
seed = newseed
dead = 0
age = 1
@@ -275,7 +275,7 @@
/obj/item/multitool
)
/obj/item/storage/bag/circuits/basic/Initialize()
/obj/item/storage/bag/circuits/basic/Initialize(mapload)
. = ..()
new /obj/item/storage/bag/circuits/mini/arithmetic(src)
new /obj/item/storage/bag/circuits/mini/trig(src)
@@ -27,8 +27,8 @@
var/datum/exonet_protocol/exonet = null
var/address_spoofed = FALSE
/obj/item/integrated_circuit/illegal/EPv2_Spoofer/New()
..()
/obj/item/integrated_circuit/illegal/EPv2_Spoofer/Initialize(mapload)
. = ..()
exonet = new(src)
exonet.make_address("EPv2_Spoofer_circuit-\ref[src]")
desc += "<br>This circuit's EPv2 address is: [exonet.address]"
@@ -84,8 +84,8 @@
return can_telecomm(src,node)
return 0
/obj/item/integrated_circuit/illegal/EPv2_Discoverer/New()
..()
/obj/item/integrated_circuit/illegal/EPv2_Discoverer/Initialize(mapload)
. = ..()
exonet = new(src)
exonet.make_address("EPv2_Discovery_circuit-\ref[src]")
desc += "<br>This circuit's EPv2 address is: [exonet.address]"
@@ -118,4 +118,4 @@
set_pin_data(IC_OUTPUT, 1, addresses)
push_data()
activate_pin(2)
activate_pin(2)
@@ -455,8 +455,8 @@
return can_telecomm(src,node)
return 0
/obj/item/integrated_circuit/input/EPv2/New()
..()
/obj/item/integrated_circuit/input/EPv2/Initialize(mapload)
. = ..()
exonet = new(src)
exonet.make_address("EPv2_circuit-\ref[src]")
desc += "<br>This circuit's EPv2 address is: [exonet.address]"
+2 -3
View File
@@ -62,9 +62,7 @@
if(visible || update_now)
if(!updating)
updating = 1
spawn(UPDATE_BUFFER) // Batch large changes, such as many doors opening or closing at once
update()
updating = 0
addtimer(CALLBACK(src, PROC_REF(update)), UPDATE_BUFFER, TIMER_DELETE_ME) // Batch large changes, such as many doors opening or closing at once
else
changed = 1
@@ -112,6 +110,7 @@
var/client/client = m.GetViewerClient()
if(client)
client.images += t.obfuscations[obfuscation.type]
updating = 0
/datum/chunk/proc/acquireVisibleTurfs(var/list/visible)
+2 -2
View File
@@ -34,8 +34,8 @@
updateVisibility(src)
return ..()
/obj/structure/New()
..()
/obj/structure/Initialize(mapload)
. = ..()
updateVisibility(src)
// EFFECTS
@@ -46,7 +46,7 @@
/obj/item/rig/protean/ex_act(severity)
return
/obj/item/rig/protean/New(var/newloc, var/mob/living/carbon/human/P)
/obj/item/rig/protean/Initialize(mapload, var/mob/living/carbon/human/P)
if(P)
var/datum/species/protean/S = P.species
S.OurRig = src
@@ -55,7 +55,7 @@
myprotean = P
else
to_chat(P, span_notice("You should have spawned with a backpack to assimilate into your RIG. Try clicking it with a backpack."))
..(newloc)
. = ..()
/obj/item/rig/protean/Destroy()
if(myprotean)
+1 -1
View File
@@ -81,7 +81,7 @@
*/
/mob/living/carbon/human/proc/nif_menu()
set name = "NIF Menu"
set category = "IC.Nif"
set category = "IC.NIF"
set desc = "Open the NIF user interface."
var/obj/item/nif/N = nif
@@ -510,7 +510,7 @@
/mob/proc/nsay(message as text)
set name = "NSay"
set desc = "Speak into your NIF's Soulcatcher."
set category = "IC.NiF"
set category = "IC.NIF"
src.nsay_act(message)
@@ -540,7 +540,7 @@
/mob/proc/nme(message as message)
set name = "NMe"
set desc = "Emote into your NIF's Soulcatcher."
set category = "IC.NiF"
set category = "IC.NIF"
src.nme_act(message)
@@ -17,7 +17,7 @@
if(N)
amount_per_transfer_from_this = N
/obj/item/reagent_containers/Initialize()
/obj/item/reagent_containers/Initialize(mapload)
. = ..()
if(!possible_transfer_amounts)
src.verbs -= /obj/item/reagent_containers/verb/set_APTFT
+2 -1
View File
@@ -887,7 +887,7 @@
to_chat(src, span_notice("You are not holding anything."))
return
if(is_type_in_list(I,edible_trash) | adminbus_trash)
if(is_type_in_list(I,edible_trash) || adminbus_trash)
if(!I.on_trash_eaten(src)) // shows object's rejection message itself
return
drop_item()
@@ -895,6 +895,7 @@
updateVRPanel()
log_admin("VORE: [src] used Eat Trash to swallow [I].")
I.after_trash_eaten(src)
visible_message(span_warning("[src] demonstrates their voracious capabilities by swallowing [I] whole!"))
return
to_chat(src, span_notice("This item is not appropriate for ethical consumption."))
return