Fixes some bugs. (#15816)

* Fixes some bugs.

* that too

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2023-02-14 11:08:14 +01:00
committed by GitHub
parent 9e6adac6a4
commit 9bf39bea97
8 changed files with 60 additions and 11 deletions

View File

@@ -317,7 +317,7 @@
up_image.plane = LIGHTING_LAYER + 1
up_image.layer = LIGHTING_LAYER + 1
usr << up_image
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), up_image), 12)
QDEL_IN(up_image, 12)
return
var/turf/T = GetAbove(usr)
if (!T)

View File

@@ -50,14 +50,14 @@
qdel(src)
return
/obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob)
/obj/structure/lattice/attackby(obj/item/C, mob/user)
if (istype(C, /obj/item/stack/tile/floor))
var/turf/T = get_turf(src)
T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead
return
if (C.iswelder())
var/obj/item/weldingtool/WT = C
if(WT.use(0, user))
if(WT.use(1, user))
to_chat(user, "<span class='notice'>Slicing lattice joints ...</span>")
new /obj/item/stack/rods(src.loc)
qdel(src)

View File

@@ -51,6 +51,7 @@
qdel(src)
return
atmos_initialised = TRUE
queue_icon_update()
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/process()
@@ -153,4 +154,5 @@
qdel(src)
return
atmos_initialised = TRUE
queue_icon_update()

View File

@@ -1045,7 +1045,7 @@
/material/graphite
name = MATERIAL_GRAPHITE
stack_type = /obj/item/stack/material/graphite
icon_base = "graphite"
icon_base = "solid"
icon_colour = "#666666"
shard_type = SHARD_STONE_PIECE
weight = 20

View File

@@ -20,7 +20,7 @@
VUEUI_MONITOR_VARS(/obj/machinery/photocopier, photocopiermonitor)
watch_var("toner", "toner")
watch_var("maxcopies", "maxcopies")
watch_var("copyitem", "gotitem", CALLBACK(null, PROC_REF(transform_to_boolean), FALSE))
watch_var("copyitem", "gotitem", CALLBACK(src, PROC_REF(transform_to_boolean), FALSE))
/obj/machinery/photocopier/vueui_data_change(var/list/data, var/mob/user, var/datum/vueui/ui)
. = ..()
@@ -69,6 +69,7 @@ VUEUI_MONITOR_VARS(/obj/machinery/photocopier, photocopiermonitor)
to_chat(usr, SPAN_NOTICE("You take \the [copyitem] out of \the [src]."))
copyitem = null
SSvueui.check_uis_for_change(src)
else if(href_list["aipic"])
if(!istype(usr,/mob/living/silicon)) return
if(stat & (BROKEN|NOPOWER)) return

View File

@@ -1584,6 +1584,7 @@
color = "#EE4B2B"
overdose = 15
metabolism = REM * 3 //0.6 units per tick
specific_heat = 1
taste_description = "pure alcohol"
/singleton/reagent/kilosemine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder)

View File

@@ -0,0 +1,44 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: MattAtlas
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Fixes HE pipes being invisible."
- bugfix: "Fixes photocopiers not having an eject paper button."
- bugfix: "Fixed lattice welding not consuming fuel."
- bugfix: "Fixed a wrong button label."

View File

@@ -7899,9 +7899,9 @@
"dQZ" = (
/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
/obj/machinery/door/blast/shutters/open{
dir = 2;
id = "shutters_deck2_hydroponicswindows";
name = "Viewing Shutter";
dir = 2
name = "Viewing Shutter"
},
/turf/simulated/floor/tiled/dark/full,
/area/horizon/kitchen/hallway)
@@ -17208,6 +17208,7 @@
},
/obj/machinery/button/remote/blast_door{
id = "shutters_deck2_eng_frontdesk";
name = "remote shutter control";
pixel_x = 6;
pixel_y = -2
},
@@ -48822,12 +48823,12 @@
/area/operations/lobby)
"xWa" = (
/obj/item/rig/medical/equipped{
pixel_y = -2;
pixel_x = 4
pixel_x = 4;
pixel_y = -2
},
/obj/item/rig/medical/equipped{
pixel_y = -2;
pixel_x = -5
pixel_x = -5;
pixel_y = -2
},
/obj/structure/window/reinforced{
dir = 8