mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-18 11:36:24 +01:00
[MIRROR] Converting art component into element. (#1562)
* Converting art component into element. (#54616) * Only art is now an element. There have been some issues with beauty. * Typo. * Update art.dm * Update art.dm * Maintainer suggestions. Reversing order of switch(impress) for correct moodlets. * Fixing some pre-existing oddities with art element. * stating the right var. * simplifying the component. * Update art.dm * lowercasing pronoun. * Converting art component into element. Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
@@ -411,9 +411,9 @@
|
||||
return
|
||||
C.add_hiddenprint(user)
|
||||
if(istagger)
|
||||
C.AddComponent(/datum/component/art, GOOD_ART)
|
||||
C.AddElement(/datum/element/art, GOOD_ART)
|
||||
else
|
||||
C.AddComponent(/datum/component/art, BAD_ART)
|
||||
C.AddElement(/datum/element/art, BAD_ART)
|
||||
|
||||
if(!instant)
|
||||
to_chat(user, "<span class='notice'>You finish drawing \the [temp].</span>")
|
||||
|
||||
@@ -536,7 +536,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
|
||||
|
||||
/obj/item/statuebust/Initialize()
|
||||
. = ..()
|
||||
AddComponent(/datum/component/art, impressiveness)
|
||||
AddElement(/datum/element/art, impressiveness)
|
||||
INVOKE_ASYNC(src, /datum.proc/_AddComponent, list(/datum/component/beauty, 1000))
|
||||
|
||||
/obj/item/statuebust/hippocratic
|
||||
|
||||
@@ -238,7 +238,7 @@
|
||||
/obj/structure/sign/painting/Initialize(mapload, dir, building)
|
||||
. = ..()
|
||||
SSpersistence.painting_frames += src
|
||||
AddComponent(/datum/component/art, 20)
|
||||
AddElement(/datum/element/art, OK_ART)
|
||||
if(dir)
|
||||
setDir(dir)
|
||||
if(building)
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
/// Beauty component mood modifier
|
||||
var/impressiveness = 15
|
||||
/// Art component subtype added to this statue
|
||||
var/art_type = /datum/component/art
|
||||
var/art_type = /datum/element/art
|
||||
/// Abstract root type
|
||||
var/abstract_type = /obj/structure/statue
|
||||
|
||||
/obj/structure/statue/Initialize()
|
||||
. = ..()
|
||||
AddComponent(art_type, impressiveness)
|
||||
AddElement(art_type, impressiveness)
|
||||
INVOKE_ASYNC(src, /datum.proc/_AddComponent, list(/datum/component/beauty, impressiveness * 75))
|
||||
AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, .proc/can_user_rotate), CALLBACK(src, .proc/can_be_rotated), null)
|
||||
|
||||
@@ -271,7 +271,7 @@
|
||||
name = "\improper Karl Marx bust"
|
||||
desc = "A bust depicting a certain 19th century economist. You get the feeling a specter is haunting the station."
|
||||
icon_state = "marx"
|
||||
art_type = /datum/component/art/rev
|
||||
art_type = /datum/element/art/rev
|
||||
|
||||
///////////Elder Atmosian///////////////////////////////////////////
|
||||
|
||||
|
||||
Reference in New Issue
Block a user