[MIRROR] Beauty is now an element. Fixing an issue with enter/exit area comsigs. (#3639)

* Beauty is now an element. Fixing an issue with enter/exit area comsigs. (#57147)

Co-authored-by: Ghommie <425422238+Ghommie@ users.noreply.github.com>

* Beauty is now an element. Fixing an issue with enter/exit area comsigs.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Ghommie <425422238+Ghommie@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-02-25 13:37:25 +00:00
committed by GitHub
co-authored by Ghommie Ghom
parent a9abe3423d
commit 1f665ef7f7
18 changed files with 143 additions and 76 deletions
+1 -1
View File
@@ -69,7 +69,7 @@
name = "poster - [name]"
desc = "A large piece of space-resistant printed paper. [desc]"
AddComponent(/datum/component/beauty, 300)
AddElement(/datum/element/beauty, 300)
/obj/structure/sign/poster/proc/randomise(base_type)
var/list/poster_types = subtypesof(base_type)
@@ -28,7 +28,7 @@
if(LAZYLEN(diseases_to_add))
AddComponent(/datum/component/infective, diseases_to_add)
AddComponent(/datum/component/beauty, beauty)
AddElement(/datum/element/beauty, beauty)
var/turf/T = get_turf(src)
if(T && is_station_level(T.z))
+1 -1
View File
@@ -543,7 +543,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/statuebust/Initialize()
. = ..()
AddElement(/datum/element/art, impressiveness)
AddComponent(/datum/component/beauty, 1000)
AddElement(/datum/element/beauty, 1000)
/obj/item/statuebust/hippocratic
name = "hippocrates bust"
+1 -1
View File
@@ -320,7 +320,7 @@
. = ..()
AddComponent(/datum/component/tactical)
AddComponent(/datum/component/two_handed, require_twohands=TRUE, force_unwielded=10, force_wielded=10)
AddComponent(/datum/component/beauty, 500)
AddElement(/datum/element/beauty, 500)
/obj/item/kirbyplants/attackby(obj/item/I, mob/living/user, params)
. = ..()
+1 -1
View File
@@ -19,7 +19,7 @@
/obj/structure/statue/Initialize()
. = ..()
AddElement(art_type, impressiveness)
AddComponent(/datum/component/beauty, impressiveness * 75)
AddElement(/datum/element/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)
/obj/structure/statue/proc/can_be_rotated(mob/user)