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.

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

More misc suns stuff #2808

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions code/game/objects/effects/decals/turfdecal/flooring_decals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1109,3 +1109,12 @@ TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140)

/obj/effect/turf_decal/arrowaxe_small/right
icon_state = "arrowaxe-right"

//SUNS

/obj/effect/turf_decal/suns
icon = 'icons/turf/decals/suns_floor.dmi'
icon_state = "top-left"

/obj/effect/turf_decal/suns/line
icon_state = "suns_border"
5 changes: 5 additions & 0 deletions code/game/objects/items/desk_flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
desc = "The blue and gold flag of the Sol Government."
icon_state = "solgov"

/obj/item/desk_flag/suns
name = "\improper SUNS desk flag"
desc = "The symbol of a student's union."
icon_state = "suns"

/obj/item/desk_flag/trans
name = "vampire desk flag"
desc = "The blue, cyan, and white flag of the transylvanian society of vampires."
Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/items/documents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
desc = "\"RESTRICTED\"-level state documents listing points in space, all within five light-years of the Bezuts star system. Portions of the document are covered in unintelligible blue annotations."
icon_state = "docs_verified"

/obj/item/documents/suns
desc = "\"RESTRICTED\"-level placeholder documents."
icon_state = "docs_blue"

/obj/item/documents/syndicate
desc = "\"Top Secret\" documents detailing sensitive Syndicate operational intelligence."

Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/items/stacks/tiles/tile_suns.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/obj/item/stack/tile/suns
name = "marble tile"
turf_type =

Check failure on line 3 in code/game/objects/items/stacks/tiles/tile_suns.dm

View workflow job for this annotation

GitHub Actions / Run Linters

Check Regex

superflous whitespace added to here, remove or update check_regex.yml
tile_reskin_types = list()

/obj/item/stack/tile/suns/dark
12 changes: 12 additions & 0 deletions code/game/objects/structures/bedsheet_bin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,12 @@ LINEN BINS
item_state = "sheetsolgov"
dream_messages = list("bureaucracy", "laws", "papers", "writing")

/obj/item/bedsheet/double/suns
name = "\improper SUNS bedsheet"
icon_state = "sheetsuns"
item_state = "sheetsuns"
desc = "PH"

/obj/item/bedsheet/ian
icon_state = "sheetian"
item_state = "sheetian"
Expand Down Expand Up @@ -356,6 +362,12 @@ LINEN BINS
dream_messages = list("bureaucracy", "laws", "papers", "writing")
desc = "It has the emblem of the Solar Confederation emblazoned upon it!"

/obj/item/bedsheet/double/suns
name = "double SUNS bedsheet"
icon_state = "double_sheetsuns"
item_state = "double_sheetsuns"
desc = "PH"

/obj/item/bedsheet/random/Initialize()
..()
var/type = pick(typesof(/obj/item/bedsheet) - (typesof(/obj/item/bedsheet/double) + /obj/item/bedsheet/random))
Expand Down
12 changes: 12 additions & 0 deletions code/game/objects/structures/signs/signs_flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@
icon_state = "flag_gezena"
item_flag = /obj/item/sign/flag/gezena

/obj/structure/sign/flag/suns
name = "\improper SUNS flag"
desc = "PH"
icon_state = "flag_suns"
item_flag = /obj/item/sign/flag/suns

// ITEM FLAGS - THE THINGS YOU HOLD AND PLACE

/obj/item/sign/flag
Expand All @@ -51,3 +57,9 @@
desc = "A folded up Gezenan Flag. Something about this flag makes you think of plants."
icon_state = "folded_gezena"
sign_path = /obj/structure/sign/flag/gezena

/obj/item/sign/flag/suns
name = "folded SUNS flag"
desc = "PH"
icon_state = "folded_suns"
sign_path = /obj/structure/sign/flag/suns
11 changes: 11 additions & 0 deletions code/modules/paperwork/folders_premade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
desc = "A folder with a Syndicate color scheme."
icon_state = "folder_syndie"

/obj/item/folder/suns
desc = "A fancy purple folder with the SUNS insignia."
icon_state = "folder_suns"

/obj/item/folder/documents
var/document = /obj/item/documents/nanotrasen
name = "folder- 'TOP SECRET'"
Expand Down Expand Up @@ -61,3 +65,10 @@
document = /obj/item/documents/terragov
desc = "A green folder with a Terran Regency seal."
icon_state = "folder_terragovred"

/obj/item/folder/documents/suns
document = /obj/item/documents/suns
desc = "A fancy purple folder with the SUNS insignia."
icon_state = "folder_sunsred"


Binary file modified icons/mob/clothing/neck.dmi
Binary file not shown.
Binary file modified icons/obj/bedsheets.dmi
Binary file not shown.
Binary file modified icons/obj/bureaucracy.dmi
Binary file not shown.
Binary file modified icons/obj/deskflags.dmi
Binary file not shown.
Binary file modified icons/obj/structures/signs/wallflags.dmi
Binary file not shown.
Binary file modified icons/obj/tiles.dmi
Binary file not shown.
File renamed without changes.
File renamed without changes.
Binary file added icons/turf/decals/suns_floor.dmi
Binary file not shown.
Binary file added icons/turf/floors/suns.dmi
Binary file not shown.
Loading