cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8910 from Ghommie/Ghommie-cit144

Browse Source 
Ports "Removes some getflaticon calls from things that don't draw browser interfaces"
This commit is contained in:
kevinz000
2019-07-17 15:08:36 -07:00
committed by GitHub
parent 7b39c0935c 676186ee36
commit 28ac38d800
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/photography/photos/frame.dm
View File

@@ -46,7 +46,7 @@
/obj/item/wallframe/picture/update_icon() /obj/item/wallframe/picture/update_icon()
cut_overlays() cut_overlays()
if(displayed) if(displayed)
add_overlay(getFlatIcon(displayed)) add_overlay(image(displayed))
/obj/item/wallframe/picture/after_attach(obj/O) /obj/item/wallframe/picture/after_attach(obj/O)
..() ..()
@@ -148,7 +148,7 @@
/obj/structure/sign/picture_frame/update_icon() /obj/structure/sign/picture_frame/update_icon()
cut_overlays() cut_overlays()
if(framed) if(framed)
add_overlay(getFlatIcon(framed)) add_overlay(image(framed))
/obj/structure/sign/picture_frame/deconstruct(disassembled = TRUE) /obj/structure/sign/picture_frame/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1)) if(!(flags_1 & NODECONSTRUCT_1))

2
code/modules/surgery/organs/augments_arms.dm
View File

@@ -132,7 +132,7 @@
else else
var/list/choice_list = list() var/list/choice_list = list()
for(var/obj/item/I in items_list) for(var/obj/item/I in items_list)
choice_list[I] = getFlatIcon(I) choice_list[I] = image(I)
var/obj/item/choice = show_radial_menu(owner, owner, choice_list) var/obj/item/choice = show_radial_menu(owner, owner, choice_list)
if(owner && owner == usr && owner.stat != DEAD && (src in owner.internal_organs) && !holder && (choice in contents)) if(owner && owner == usr && owner.stat != DEAD && (src in owner.internal_organs) && !holder && (choice in contents))
// This monster sanity check is a nice example of how bad input is. // This monster sanity check is a nice example of how bad input is.