[TM FOR THE LOVE OF GOD] Makes a bunch of random things initialise. (#25539)

* I disabled my lunacy inhibitors

* Update code/game/objects/objs.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
AffectedArc07
2024-06-12 22:53:58 +01:00
committed by GitHub
parent 3479f84437
commit b842e3909a
9 changed files with 31 additions and 36 deletions
-4
View File
@@ -1344,10 +1344,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
simulated = 0
see_in_dark = 1e6
/mob/dview/New() //For whatever reason, if this isn't called, then BYOND will throw a type mismatch runtime when attempting to add this to the mobs list. -Fox
SHOULD_CALL_PARENT(FALSE)
return
/mob/dview/Destroy()
SHOULD_CALL_PARENT(FALSE)
// should never be deleted
+2 -2
View File
@@ -406,12 +406,12 @@
var/health_cost = 0 //The amount of health taken from the user when invoking the spell
var/datum/action/innate/cult/blood_spell/source
/obj/item/melee/blood_magic/New(loc, spell)
/obj/item/melee/blood_magic/Initialize(mapload, spell)
. = ..()
if(has_source)
source = spell
uses = source.charges
health_cost = source.health_cost
..()
/obj/item/melee/blood_magic/Destroy()
if(has_source && !QDELETED(source))
+4 -4
View File
@@ -6,9 +6,9 @@
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
/obj/item/tome/New()
/obj/item/tome/Initialize(mapload)
. = ..()
icon_state = GET_CULT_DATA(tome_icon, "tome")
..()
/obj/item/melee/cultblade
name = "cult blade"
@@ -24,10 +24,10 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
sprite_sheets_inhand = list("Skrell" = 'icons/mob/clothing/species/skrell/held.dmi') // To stop skrell stabbing themselves in the head
/obj/item/melee/cultblade/New()
/obj/item/melee/cultblade/Initialize(mapload)
. = ..()
icon_state = GET_CULT_DATA(sword_icon, "blood_blade")
item_state = GET_CULT_DATA(sword_icon, "blood_blade")
..()
/obj/item/melee/cultblade/examine(mob/user)
. = ..()
+2 -2
View File
@@ -20,8 +20,8 @@
force = 16
scribe_multiplier = 0.1
/obj/item/melee/cultblade/dagger/New()
..()
/obj/item/melee/cultblade/dagger/Initialize(mapload)
. = ..()
icon_state = GET_CULT_DATA(dagger_icon, "blood_dagger")
item_state = GET_CULT_DATA(dagger_icon, "blood_dagger")
+6 -6
View File
@@ -57,8 +57,8 @@ To draw a rune, use a ritual dagger.
/// The color of the rune. (Based on species blood color)
var/rune_blood_color = COLOR_BLOOD_BASE
/obj/effect/rune/New(loc, set_keyword)
..()
/obj/effect/rune/Initialize(mapload, set_keyword)
. = ..()
if(set_keyword)
keyword = set_keyword
var/image/blood = image(loc = src)
@@ -440,8 +440,8 @@ structure_check() searches for nearby cultist structures required for the invoca
var/obj/effect/temp_visual/cult/rune_spawn/rune2/outer_portal
var/listkey
/obj/effect/rune/teleport/New(loc, set_keyword)
..()
/obj/effect/rune/teleport/Initialize(mapload, set_keyword)
. = ..()
var/area/A = get_area(src)
var/locname = initial(A.name)
listkey = set_keyword ? "[set_keyword] [locname]":"[locname]"
@@ -1043,8 +1043,8 @@ structure_check() searches for nearby cultist structures required for the invoca
scribe_damage = 10 //how much damage you take doing it
var/used = FALSE
/obj/effect/rune/narsie/New()
..()
/obj/effect/rune/narsie/Initialize(mapload)
. = ..()
cultist_name = "Summon [GET_CULT_DATA(entity_name, "your god")]"
cultist_desc = "tears apart dimensional barriers, calling forth [GET_CULT_DATA(entity_title3, "your god")]."
@@ -427,12 +427,12 @@ CONTENTS:
item_state = "abductor_headset"
ks2type = /obj/item/encryptionkey/heads/captain
/obj/item/radio/headset/abductor/New()
..()
make_syndie()
/obj/item/radio/headset/abductor/Initialize()
. = ..()
make_syndie() // Why the hell is this a proc why cant it just be a subtype
/obj/item/radio/headset/abductor/screwdriver_act()
return// Stops humans from disassembling abductor headsets.
return // Stops humans from disassembling abductor headsets.
/////////////////////////////////////////
///////////// SCIENTIST GEAR ////////////
@@ -51,6 +51,6 @@
icon_state = "teleport"
duration = 80
/obj/effect/temp_visual/teleport_abductor/New()
/obj/effect/temp_visual/teleport_abductor/Initialize(mapload)
. = ..()
do_sparks(10, 0, loc)
..()
+1 -1
View File
@@ -384,7 +384,7 @@ GLOBAL_LIST_EMPTY(turret_icons)
else if(allowed(user))
locked = !locked
to_chat(user, "<span class='notice'>Controls are now [locked ? "locked" : "unlocked"].</span>")
updateUsrDialog()
SStgui.update_uis(src)
else
to_chat(user, "<span class='notice'>Access denied.</span>")
+10 -11
View File
@@ -39,17 +39,6 @@
var/list/req_one_access = null
var/req_one_access_txt = "0"
/obj/New()
..()
if(obj_integrity == null)
obj_integrity = max_integrity
if(on_blueprints && isturf(loc))
var/turf/T = loc
if(force_blueprints)
T.add_blueprints(src)
else
T.add_blueprints_preround(src)
/obj/Initialize(mapload)
. = ..()
if(islist(armor))
@@ -61,6 +50,15 @@
if(sharp)
AddComponent(/datum/component/surgery_initiator)
if(obj_integrity == null)
obj_integrity = max_integrity
if(on_blueprints && isturf(loc))
var/turf/T = loc
if(force_blueprints)
T.add_blueprints(src)
else
T.add_blueprints_preround(src)
/obj/Topic(href, href_list, nowindow = FALSE, datum/ui_state/state = GLOB.default_state)
// Calling Topic without a corresponding window open causes runtime errors
if(!nowindow && ..())
@@ -86,6 +84,7 @@
if(!ismachinery(src))
if(!speed_process)
STOP_PROCESSING(SSobj, src) // TODO: Have a processing bitflag to reduce on unnecessary loops through the processing lists
// AA 2024-05-20 - processing var?????
else
STOP_PROCESSING(SSfastprocess, src)
return ..()