Skip to content

Commit

Permalink
Barsigns Competition (#1155)
Browse files Browse the repository at this point in the history
* I think i'm good man

* А если так?

* Так и не понял, почему это "черный список"

* Maybe like that?

* Okay
  • Loading branch information
RaShCAt authored Dec 17, 2023
1 parent f7a73fa commit 836a096
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 2 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/~ff_defines/barsigns.dm
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
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
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
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
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 @@ -8050,6 +8051,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

0 comments on commit 836a096

Please sign in to comment.