mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 12:08:28 +01:00
more new/init fixes
This commit is contained in:
+10
-14
@@ -1166,18 +1166,16 @@ var/list/WALLITEMS = list(
|
||||
var/color = hex ? hex : "#[num2hex(red, 2)][num2hex(green, 2)][num2hex(blue, 2)]"
|
||||
return "<span style='font-face: fixedsys; font-size: 14px; background-color: [color]; color: [color]'>___</span>"
|
||||
|
||||
|
||||
var/mob/dview/dview_mob = new
|
||||
|
||||
//Version of view() which ignores darkness, because BYOND doesn't have it.
|
||||
/proc/dview(var/range = world.view, var/center, var/invis_flags = 0)
|
||||
if(!center)
|
||||
return
|
||||
if(!dview_mob) //VOREStation Add: Debugging
|
||||
dview_mob = new
|
||||
log_error("Had to recreate the dview mob!")
|
||||
|
||||
dview_mob.loc = center
|
||||
|
||||
|
||||
dview_mob.see_invisible = invis_flags
|
||||
|
||||
. = view(range, dview_mob)
|
||||
@@ -1185,10 +1183,10 @@ var/mob/dview/dview_mob = new
|
||||
|
||||
/mob/dview
|
||||
invisibility = 101
|
||||
density = FALSE
|
||||
density = 0
|
||||
|
||||
anchored = TRUE
|
||||
simulated = FALSE
|
||||
anchored = 1
|
||||
simulated = 0
|
||||
|
||||
see_in_dark = 1e6
|
||||
|
||||
@@ -1197,7 +1195,6 @@ var/mob/dview/dview_mob = new
|
||||
color = origin.color
|
||||
set_light(origin.light_range, origin.light_power, origin.light_color)
|
||||
|
||||
INITIALIZE_IMMEDIATE(/mob/dview)
|
||||
/mob/dview/Initialize()
|
||||
. = ..()
|
||||
// We don't want to be in any mob lists; we're a dummy not a mob.
|
||||
@@ -1207,18 +1204,17 @@ INITIALIZE_IMMEDIATE(/mob/dview)
|
||||
else
|
||||
living_mob_list -= src
|
||||
|
||||
/mob/dview/Life()
|
||||
mob_list -= src
|
||||
dead_mob_list -= src
|
||||
living_mob_list -= src
|
||||
|
||||
/mob/dview/Destroy(var/force)
|
||||
stack_trace("Attempt to delete the dview_mob: [log_info_line(src)]")
|
||||
crash_with("Attempt to delete the dview_mob: [log_info_line(src)]")
|
||||
if (!force)
|
||||
return QDEL_HINT_LETMELIVE
|
||||
global.dview_mob = new
|
||||
return ..()
|
||||
|
||||
// call to generate a stack trace and print to runtime logs
|
||||
/proc/crash_with(msg)
|
||||
CRASH(msg)
|
||||
|
||||
/proc/screen_loc2turf(scr_loc, turf/origin)
|
||||
var/tX = splittext(scr_loc, ",")
|
||||
var/tY = splittext(tX[2], ":")
|
||||
|
||||
@@ -20,10 +20,10 @@
|
||||
|
||||
// Then wait awhile.
|
||||
while(!finished)
|
||||
sleep(1 SECOND)
|
||||
wait_time -= 1 SECOND
|
||||
if(wait_time <= 0)
|
||||
finished = TRUE
|
||||
spawn(1 SECOND)
|
||||
wait_time -= 1 SECOND
|
||||
if(wait_time <= 0)
|
||||
finished = TRUE
|
||||
|
||||
// Prune the list after the wait, incase any candidates logged out.
|
||||
for(var/mob/observer/dead/D as anything in candidates)
|
||||
|
||||
@@ -14,16 +14,16 @@
|
||||
|
||||
//Predefined materials go here.
|
||||
/obj/item/weapon/material/twohanded/baseballbat/metal/Initialize(var/ml)
|
||||
..(ml, MAT_STEEL)
|
||||
. = ..(ml, MAT_STEEL)
|
||||
|
||||
/obj/item/weapon/material/twohanded/baseballbat/uranium/Initialize(var/ml)
|
||||
..(ml, MAT_URANIUM)
|
||||
. = ..(ml, MAT_URANIUM)
|
||||
|
||||
/obj/item/weapon/material/twohanded/baseballbat/gold/Initialize(var/ml)
|
||||
..(ml, MAT_GOLD)
|
||||
. = ..(ml, MAT_GOLD)
|
||||
|
||||
/obj/item/weapon/material/twohanded/baseballbat/platinum/Initialize(var/ml)
|
||||
..(ml, MAT_PLATINUM)
|
||||
. = ..(ml, MAT_PLATINUM)
|
||||
|
||||
/obj/item/weapon/material/twohanded/baseballbat/diamond/Initialize(var/ml)
|
||||
..(ml, MAT_DIAMOND)
|
||||
. = ..(ml, MAT_DIAMOND)
|
||||
|
||||
@@ -19,9 +19,11 @@
|
||||
|
||||
/obj/structure/catwalk/Initialize()
|
||||
. = ..()
|
||||
for(var/obj/structure/catwalk/C in get_turf(src))
|
||||
//Delete ourselves if we find extra mapped in catwalks
|
||||
for(var/obj/structure/catwalk/C in loc)
|
||||
if(C != src)
|
||||
qdel(C)
|
||||
log_debug("Duplicate catwalks at [x],[y],[z]")
|
||||
return INITIALIZE_HINT_QDEL
|
||||
update_connections(1)
|
||||
update_icon()
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
clothing_possibilities |= /obj/item/device/radio/headset
|
||||
|
||||
/obj/structure/ghost_pod/ghost_activated/human/create_occupant(var/mob/M)
|
||||
..()
|
||||
. = ..()
|
||||
var/turf/T = get_turf(src)
|
||||
var/mob/living/carbon/human/H = new(src)
|
||||
|
||||
|
||||
@@ -70,8 +70,8 @@
|
||||
center_of_mass = list("x"=16, "y"=8)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb/Initialize()
|
||||
..()
|
||||
reagents.add_reagent("dr_gibb", 30)
|
||||
. = ..()
|
||||
reagents.add_reagent("dr_gibb", 30)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb_diet
|
||||
name = "\improper Diet Dr. Gibb"
|
||||
|
||||
@@ -265,18 +265,18 @@
|
||||
icon_state = "wake"
|
||||
animate(src,alpha = 255,time = 1 SECOND)
|
||||
plane = MOB_PLANE
|
||||
sleep(7)
|
||||
update_icon()
|
||||
//Potential glob noms
|
||||
if(can_be_drop_pred) //Toggleable in vore panel
|
||||
var/list/potentials = living_mobs(0)
|
||||
if(potentials.len)
|
||||
var/mob/living/target = pick(potentials)
|
||||
if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected)
|
||||
if(target.buckled)
|
||||
target.buckled.unbuckle_mob(target, force = TRUE)
|
||||
target.forceMove(vore_selected)
|
||||
to_chat(target,"<span class='warning'>\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")
|
||||
spawn(7)
|
||||
update_icon()
|
||||
//Potential glob noms
|
||||
if(can_be_drop_pred) //Toggleable in vore panel
|
||||
var/list/potentials = living_mobs(0)
|
||||
if(potentials.len)
|
||||
var/mob/living/target = pick(potentials)
|
||||
if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected)
|
||||
if(target.buckled)
|
||||
target.buckled.unbuckle_mob(target, force = TRUE)
|
||||
target.forceMove(vore_selected)
|
||||
to_chat(target,"<span class='warning'>\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!</span>")
|
||||
|
||||
/mob/living/simple_mob/protean_blob/attack_target(var/atom/A)
|
||||
if(refactory && istype(A,/obj/item/stack/material))
|
||||
|
||||
Reference in New Issue
Block a user