Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Barsigns Competition #1155

Merged
merged 5 commits into from Dec 17, 2023
Merged

Barsigns Competition #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b40ea4
I think i'm good man
RashCat Dec 16, 2023
f9dbdab
А если так?
RashCat Dec 16, 2023
bd8da0b
Так и не понял, почему это "черный список"
RashCat Dec 16, 2023
2c9541b
Maybe like that?
RashCat Dec 17, 2023
2796c8a
Okay
RashCat Dec 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/~ff_defines/barsigns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#define TFF_BARSIGN_FILE 'tff_modular/modules/barsigns/icons/barsigns.dmi'
5 changes: 3 additions & 2 deletions code/modules/unit_tests/barsigns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
* Test if icon states for each datum actually exist in the DMI.
*/
/datum/unit_test/barsigns_icon
var/list/blacklisted_sign_types = list(/datum/barsign/skyrat, /datum/barsign/skyrat/large) // SKYRAT EDIT ADDITION - Modular barsigns
var/list/blacklisted_sign_types = list(/datum/barsign/fluffy, /datum/barsign/skyrat, /datum/barsign/skyrat/large) // SKYRAT EDIT ADDITION - Modular barsigns // THE FLUFFY FRONTIER EDIT ADDITION - Modular barsigns

/datum/unit_test/barsigns_icon/Run()
var/obj/machinery/barsign_type = /obj/machinery/barsign
var/icon/barsign_icon = initial(barsign_type.icon)
var/list/barsign_icon_states = icon_states(barsign_icon)
barsign_icon_states += icon_states(SKYRAT_BARSIGN_FILE) // SKYRAT EDIT ADDITION - Need to check modular barsigns
barsign_icon_states += icon_states(TFF_BARSIGN_FILE) // THE FLUFFY FRONTIER - Need to check modular barsigns
barsign_icon_states += icon_states(SKYRAT_LARGE_BARSIGN_FILE) // SKYRAT EDIT ADDITION - Need to check modular barsigns

// Check every datum real bar sign
Expand All @@ -26,7 +27,7 @@
* Check that bar signs have a name and desc, and that the name is unique.
*/
/datum/unit_test/barsigns_name
var/list/blacklisted_sign_types = list(/datum/barsign/skyrat, /datum/barsign/skyrat/large) // SKYRAT EDIT ADDITION - Modular barsigns
var/list/blacklisted_sign_types = list(/datum/barsign/fluffy, /datum/barsign/skyrat, /datum/barsign/skyrat/large) // SKYRAT EDIT ADDITION - Modular barsigns // THE FLUFFY FRONTIER EDIT ADDITION - Modular barsigns

/datum/unit_test/barsigns_name/Run()
var/list/existing_names = list()
Expand Down
17 changes: 17 additions & 0 deletions tff_modular/modules/barsigns/code/barsigns.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Modularly copypaste-set the correct icon file
/obj/machinery/barsign/update_icon_state()
. = ..()
// Try to use TFF override
if(istype(chosen_sign, /datum/barsign/fluffy))
icon = TFF_BARSIGN_FILE
return

/datum/barsign/fluffy/thelastlight
name = "The Last Light"
icon_state = "lastlight"
neon_color = "#EBB823"

/datum/barsign/fluffy/afterlife
name = "After Life"
icon_state = "afterlife"
neon_color = "#3bfa74"
Binary file added tff_modular/modules/barsigns/icons/barsigns.dmi
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@
#include "code\__DEFINES\traits\declarations.dm"
#include "code\__DEFINES\traits\macros.dm"
#include "code\__DEFINES\traits\sources.dm"
#include "code\__DEFINES\~ff_defines\barsigns.dm"
#include "code\__DEFINES\~ff_defines\DNA.dm"
#include "code\__DEFINES\~ff_defines\nabber_clothes_pathes.dm"
#include "code\__DEFINES\~ff_defines\say.dm"
Expand Down Expand Up @@ -8047,6 +8048,7 @@
#include "tff_modular\master_files\code\modules\mod\mod_clothes.dm"
#include "tff_modular\master_files\code\modules\reagents\recipe\coagulant_recipe.dm"
#include "tff_modular\modules\autoaccent\code\autoaccent.dm"
#include "tff_modular\modules\barsigns\code\barsigns.dm"
#include "tff_modular\modules\blooper\atoms_movable.dm"
#include "tff_modular\modules\blooper\bark.dm"
#include "tff_modular\modules\blooper\bark_list.dm"
Expand Down
Loading