mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-07-12 07:35:31 +01:00
sane stacks (#18342)
* sane stacks * . * . * . * - * clean that up * . * . * fix chat scaling * readd cords * . * guh --------- Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
This commit is contained in:
@@ -38,8 +38,10 @@ ADMIN_VERB_AND_CONTEXT_MENU(debug_variables, (R_DEBUG|R_SERVER|R_ADMIN|R_SPAWN|R
|
||||
var/type = islist ? /list : thing.type
|
||||
var/no_icon = FALSE
|
||||
|
||||
var/cord_line
|
||||
if(isatom(thing))
|
||||
var/atom/AT = thing
|
||||
cord_line = "<A href='byond://?_src_=holder;[HrefToken()];jumpto=\ref[thing]'>x:[AT.x] y:[AT.y] z:[AT.z]</A> "
|
||||
if(use_gfi)
|
||||
sprite = getFlatIcon(thing)
|
||||
if(!sprite)
|
||||
@@ -265,6 +267,7 @@ ADMIN_VERB_AND_CONTEXT_MENU(debug_variables, (R_DEBUG|R_SERVER|R_ADMIN|R_SPAWN|R
|
||||
<span id='tagged'>[tagged_line]</span>
|
||||
<span id='varedited'>[varedited_line]</span>
|
||||
<span id='deleted'>[deleted_line]</span>
|
||||
<br><font size='1'>[cord_line]</font>
|
||||
</div>
|
||||
</td>
|
||||
<td width='50%'>
|
||||
|
||||
@@ -351,8 +351,8 @@
|
||||
X << 'sound/effects/tones/newplayerping.ogg'
|
||||
window_flash(X)
|
||||
//VOREStation Edit end.
|
||||
fully_created = TRUE
|
||||
attempt_auto_fit_viewport()
|
||||
fully_created = TRUE
|
||||
|
||||
// Now that we're fully initialized, use our prefs
|
||||
if(prefs?.read_preference(/datum/preference/toggle/browser_dev_tools))
|
||||
|
||||
@@ -305,7 +305,7 @@
|
||||
desc = "Soft substance produced by bees. Used to make candles."
|
||||
icon = 'icons/obj/beekeeping.dmi'
|
||||
icon_state = "wax"
|
||||
default_type = "wax"
|
||||
default_type = MAT_WAX
|
||||
pass_color = TRUE
|
||||
strict_color_stacking = TRUE
|
||||
|
||||
@@ -314,7 +314,7 @@
|
||||
recipes = wax_recipes
|
||||
|
||||
/datum/material/wax
|
||||
name = "wax"
|
||||
name = MAT_WAX
|
||||
stack_type = /obj/item/stack/material/wax
|
||||
icon_colour = "#fff343"
|
||||
melting_point = T0C+300
|
||||
|
||||
@@ -14,27 +14,27 @@
|
||||
wiki_flag = WIKI_SPOILER
|
||||
|
||||
/datum/material/alienalloy/elevatorium
|
||||
name = "elevatorium"
|
||||
name = MAT_ALIEN_ELEVAT
|
||||
display_name = "elevator panelling"
|
||||
table_icon_base = "stone"
|
||||
icon_colour = "#666666"
|
||||
|
||||
/datum/material/alienalloy/dungeonium
|
||||
name = "dungeonium"
|
||||
name = MAT_ALIEN_DUNGEON
|
||||
display_name = "ultra-durable"
|
||||
icon_base = "dungeon"
|
||||
table_icon_base = "stone"
|
||||
icon_colour = "#FFFFFF"
|
||||
|
||||
/datum/material/alienalloy/bedrock
|
||||
name = "bedrock"
|
||||
name = MAT_ALIEN_BEDROCK
|
||||
display_name = "impassable rock"
|
||||
icon_base = "rock"
|
||||
table_icon_base = "stone"
|
||||
icon_colour = "#FFFFFF"
|
||||
|
||||
/datum/material/alienalloy/alium
|
||||
name = "alium"
|
||||
name = MAT_ALIEN_ALIUM
|
||||
display_name = "alien"
|
||||
icon_base = "alien"
|
||||
table_icon_base = "alien"
|
||||
|
||||
@@ -31,6 +31,7 @@
|
||||
default_type = MAT_STEEL
|
||||
material = get_material_by_name("[default_type]")
|
||||
if(!material)
|
||||
stack_trace("Material of type: [default_type] does not exist.")
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
recipes = material.get_recipes()
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
machine.console = src
|
||||
else
|
||||
//Silently failing and causing mappers to scratch their heads while runtiming isn't ideal.
|
||||
to_world(span_danger("Warning: Stacking machine console at [src.x], [src.y], [src.z] could not find its machine!"))
|
||||
stack_trace(span_danger("Warning: Stacking machine console at [src.x], [src.y], [src.z] could not find its machine!"))
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/obj/machinery/mineral/stacking_unit_console/attack_hand(mob/user)
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
name = "rutile"
|
||||
icon_state = "ore_rutile"
|
||||
origin_tech = list(TECH_MATERIAL = 2)
|
||||
material = "rutile"
|
||||
material = ORE_RUTILE
|
||||
|
||||
@@ -208,8 +208,7 @@
|
||||
|
||||
/datum/species/protean/equip_survival_gear(var/mob/living/carbon/human/H)
|
||||
..()
|
||||
var/obj/item/stack/material/steel/metal_stack = new()
|
||||
metal_stack.set_amount(5)
|
||||
var/obj/item/stack/material/steel/metal_stack = new(null, 5)
|
||||
|
||||
var/obj/item/clothing/accessory/permit/nanotech/permit = new()
|
||||
permit.set_name(H.real_name)
|
||||
|
||||
@@ -150,7 +150,9 @@
|
||||
for(var/i = 1 to get_dist(src, destination))
|
||||
if(stat)
|
||||
return FALSE // We died or got knocked out on the way.
|
||||
if(loc == destination)
|
||||
|
||||
var/last_loc = loc
|
||||
if(last_loc == destination)
|
||||
break // We somehow got there early.
|
||||
|
||||
// Update T.
|
||||
@@ -176,6 +178,8 @@
|
||||
dig_under_floor(get_turf(src))
|
||||
playsound(src, 'sound/effects/break_stone.ogg', 75, 1)
|
||||
sleep(tunnel_tile_speed)
|
||||
if(last_loc == loc)
|
||||
return FALSE
|
||||
|
||||
// For visuals.
|
||||
/mob/living/simple_mob/animal/giant_spider/tunneler/proc/submerge()
|
||||
|
||||
@@ -197,7 +197,7 @@
|
||||
if(S && S.get_amount() < S.max_amount)
|
||||
S.add(1)
|
||||
else
|
||||
new stacktype(T)
|
||||
new stacktype(T, 1)
|
||||
|
||||
/obj/item/debris_pack
|
||||
name = "debris"
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
can_plate = FALSE
|
||||
|
||||
/obj/structure/table/alien/Initialize(mapload)
|
||||
material = get_material_by_name("alium")
|
||||
material = get_material_by_name(MAT_ALIEN_ALIUM)
|
||||
verbs -= /obj/structure/table/verb/do_flip
|
||||
verbs -= /obj/structure/table/proc/do_put
|
||||
. = ..()
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
/turf/simulated/wall/elevator/Initialize(mapload)
|
||||
. = ..(mapload, "elevatorium")
|
||||
. = ..(mapload, MAT_ALIEN_ELEVAT)
|
||||
|
||||
Reference in New Issue
Block a user