From a38aca4da614e6d817e1e777e1c8bd6f2f77d6d6 Mon Sep 17 00:00:00 2001
From: Letter N <24603524+LetterN@users.noreply.github.com>
Date: Sat, 22 Aug 2020 13:11:13 +0800
Subject: [PATCH] tgui moment.
---
.../computers/_modular_computer_shared.dm | 2 +-
code/modules/photography/_pictures.dm | 8 +--
code/modules/photography/photos/photo.dm | 34 +++-------
tgui/packages/tgui-panel/Panel.js | 6 +-
tgui/packages/tgui-panel/settings/reducer.js | 2 +-
tgui/packages/tgui-panel/themes.js | 65 ++++++++++++++++---
.../packages/tgui/public/tgui-panel.bundle.js | 2 +-
7 files changed, 74 insertions(+), 45 deletions(-)
diff --git a/code/modules/modular_computers/computers/_modular_computer_shared.dm b/code/modules/modular_computers/computers/_modular_computer_shared.dm
index f0583a9af1..9dde9a0c49 100644
--- a/code/modules/modular_computers/computers/_modular_computer_shared.dm
+++ b/code/modules/modular_computers/computers/_modular_computer_shared.dm
@@ -47,7 +47,7 @@
var/obj/item/computer_hardware/card_slot/card_slot2 = get_modular_computer_part(MC_CARD2)
var/multiple_slots = istype(card_slot) && istype(card_slot2)
if(card_slot)
- if(card_slot.stored_card || card_slot2.stored_card)
+ if(card_slot?.stored_card || card_slot2?.stored_card)
var/obj/item/card/id/first_ID = card_slot.stored_card
var/obj/item/card/id/second_ID = card_slot2.stored_card
var/multiple_cards = istype(first_ID) && istype(second_ID)
diff --git a/code/modules/photography/_pictures.dm b/code/modules/photography/_pictures.dm
index f667e18f47..6f85cdb3a6 100644
--- a/code/modules/photography/_pictures.dm
+++ b/code/modules/photography/_pictures.dm
@@ -30,16 +30,16 @@
if(autogenerate_icon && !picture_icon && picture_image)
regenerate_small_icon()
-/datum/picture/proc/get_small_icon()
+/datum/picture/proc/get_small_icon(iconstate)
if(!picture_icon)
- regenerate_small_icon()
+ regenerate_small_icon(iconstate)
return picture_icon
-/datum/picture/proc/regenerate_small_icon()
+/datum/picture/proc/regenerate_small_icon(iconstate)
if(!picture_image)
return
var/icon/small_img = icon(picture_image)
- var/icon/ic = icon('icons/obj/items_and_weapons.dmi', "photo")
+ var/icon/ic = icon('icons/obj/items_and_weapons.dmi', iconstate ? iconstate :"photo")
small_img.Scale(8, 8)
ic.Blend(small_img,ICON_OVERLAY, 13, 13)
picture_icon = ic
diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm
index 5c78709e9b..c363c549de 100644
--- a/code/modules/photography/photos/photo.dm
+++ b/code/modules/photography/photos/photo.dm
@@ -35,23 +35,23 @@
/obj/item/photo/update_icon_state()
if(!istype(picture) || !picture.picture_image)
return
- var/icon/I = picture.get_small_icon()
+ var/icon/I = picture.get_small_icon(initial(icon_state))
if(I)
icon = I
/obj/item/photo/suicide_act(mob/living/carbon/user)
user.visible_message("[user] is taking one last look at \the [src]! It looks like [user.p_theyre()] giving in to death!")//when you wanna look at photo of waifu one last time before you die...
if (user.gender == MALE)
- playsound(user, 'sound/voice/human/manlaugh1.ogg', 50, 1)//EVERY TIME I DO IT MAKES ME LAUGH
+ playsound(user, 'sound/voice/human/manlaugh1.ogg', 50, TRUE)//EVERY TIME I DO IT MAKES ME LAUGH
else if (user.gender == FEMALE)
- playsound(user, 'sound/voice/human/womanlaugh.ogg', 50, 1)
+ playsound(user, 'sound/voice/human/womanlaugh.ogg', 50, TRUE)
return OXYLOSS
/obj/item/photo/attack_self(mob/user)
user.examinate(src)
/obj/item/photo/attackby(obj/item/P, mob/user, params)
- if(try_burn(P, user))
+ if(burn_paper_product_attackby_check(P, user))
return
if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon))
if(!user.is_literate())
@@ -60,31 +60,13 @@
var/txt = stripped_input(user, "What would you like to write on the back?", "Photo Writing", "", 128)
if(txt && user.canUseTopic(src, BE_CLOSE))
scribble = txt
- ..()
-
-/obj/item/photo/proc/try_burn(obj/item/I, mob/living/user)
- var/ignition_message = I.ignition_effect(src, user)
- if(!ignition_message)
- return
- . = TRUE
- if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10) && Adjacent(user))
- user.visible_message("[user] accidentally ignites [user.p_them()]self!", \
- "You miss [src] and accidentally light yourself on fire!")
- if(user.is_holding(I)) //checking if they're holding it in case TK is involved
- user.dropItemToGround(I)
- user.adjust_fire_stacks(1)
- user.IgniteMob()
- return
-
- if(user.is_holding(src)) //no TK shit here.
- user.dropItemToGround(src)
- user.visible_message(ignition_message)
- add_fingerprint(user)
- fire_act(I.get_temperature())
+ else
+ return ..()
/obj/item/photo/examine(mob/user)
. = ..()
- if(in_range(src, user))
+
+ if(in_range(src, user) || isobserver(user))
show(user)
else
. += "You need to get closer to get a good look at this photo!"
diff --git a/tgui/packages/tgui-panel/Panel.js b/tgui/packages/tgui-panel/Panel.js
index d86a1fc8e8..0350fb94c3 100644
--- a/tgui/packages/tgui-panel/Panel.js
+++ b/tgui/packages/tgui-panel/Panel.js
@@ -31,8 +31,8 @@ export const Panel = (props, context) => {
);
}
}
- return (
-
+ return ( // yes i know it's bad.
+
@@ -116,7 +116,7 @@ export const Panel = (props, context) => {
const HoboIE8Panel = (props, context) => {
const settings = useSettings(context);
return (
-
+