Fixes fulp antag icons (#1439)

* Fixes fulp antag icons

* test commit

* Revert "test commit"

This reverts commit 93f582dd5b.

* theia fixes

* Update TheiaStation.dmm

.github/workflows/auto_changelog.yml

@@ -14,7 +14,7 @@ jobs:
     if: github.event.pull_request.merged == true
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Generate App Token
         id: app-token-generation

.github/workflows/autowiki.yml

@@ -20,7 +20,7 @@ jobs:
           echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
       - name: Checkout
         if: steps.secrets_set.outputs.SECRETS_ENABLED
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Install BYOND
         if: steps.secrets_set.outputs.SECRETS_ENABLED
         uses: ./.github/actions/restore_or_install_byond

.github/workflows/codeowner_reviews.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so the job can access it
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       #Parse the Codeowner file on non draft PRs
       - name: CodeOwnersParser

.github/workflows/collect_data.yml

@@ -27,7 +27,7 @@ jobs:
       required_build_versions: ${{ steps.setup_required_build_versions.outputs.required_build_versions }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Find Maps
         id: map_finder
         run: |

.github/workflows/compare_screenshots.yml

@@ -8,7 +8,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup directory
         run: mkdir -p artifacts
       # If we ever add more artifacts, this is going to break, but it'll be obvious.

.github/workflows/compile_all_maps.yml

@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup Bun
         uses: ./.github/actions/setup_bun
       - name: Restore BYOND from Cache
@@ -35,7 +35,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup Bun
         uses: ./.github/actions/setup_bun
       - name: Restore BYOND from Cache

.github/workflows/compile_changelogs.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: "Checkout"
         if: steps.value_holder.outputs.ACTIONS_ENABLED
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 25
           persist-credentials: false

.github/workflows/discord_discussions.yml

@@ -34,7 +34,7 @@ jobs:
           dotnet-quality: ga
 
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Build Tgstation.DiscordDiscussions
         run: dotnet publish -c Release -o discord_discussions_bins tools/Tgstation.DiscordDiscussions/Tgstation.DiscordDiscussions.csproj

.github/workflows/gbp.yml

@@ -12,7 +12,7 @@ jobs:
       issues: write # to apply labels
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Run Auto Labeler
         uses: actions/github-script@v8
         with:
@@ -40,7 +40,7 @@ jobs:
           echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
       - name: Checkout
         if: steps.value_holder.outputs.ACTIONS_ENABLED
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Setup git
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
@@ -48,7 +48,7 @@ jobs:
           git config --global user.email "<>"
       - name: Checkout alternate branch
         if: steps.value_holder.outputs.ACTIONS_ENABLED
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: "gbp-balances" # The branch name
           path: gbp-balances

.github/workflows/gbp_collect.yml

@@ -18,7 +18,7 @@ jobs:
           echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
       - name: Checkout
         if: steps.value_holder.outputs.ACTIONS_ENABLED
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Setup git
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         run: |
@@ -26,7 +26,7 @@ jobs:
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
       - name: Checkout alternate branch
         if: steps.value_holder.outputs.ACTIONS_ENABLED
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: "gbp-balances" # The branch name
           path: gbp-balances

.github/workflows/generate_documentation.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-22.04
     concurrency: gen-docs
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup cache
         uses: actions/cache@v4
         with:

.github/workflows/remove_guide_comments.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Remove guide comments
         uses: actions/github-script@v8
         with:

.github/workflows/rerun_flaky_tests.yml

@@ -10,7 +10,7 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt == 1 }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Rerun flaky tests
         uses: actions/github-script@v8
         with:
@@ -22,7 +22,7 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.run_attempt == 2 }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Report flaky tests
         uses: actions/github-script@v8
         with:

.github/workflows/run_integration_tests.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Restore BYOND from Cache
         uses: ./.github/actions/restore_or_install_byond
         with:

.github/workflows/run_linters.yml

@@ -9,7 +9,7 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Restore SpacemanDMM cache
         uses: actions/cache@v4
         with:

.github/workflows/setup_build_artifact.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup Bun
         uses: ./.github/actions/setup_bun
       - name: Restore BYOND from Cache

.github/workflows/show_screenshot_test_results.yml

@@ -25,7 +25,7 @@ jobs:
           echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
       - name: Checkout
         if: steps.secrets_set.outputs.SECRETS_ENABLED
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Prepare module
         if: steps.secrets_set.outputs.SECRETS_ENABLED
         run: |

.github/workflows/test_merge_bot.yml

@@ -23,7 +23,7 @@ jobs:
           echo "GET_TEST_MERGES_URL=$SECRET_EXISTS" >> $GITHUB_OUTPUT
       - name: Checkout
         if: steps.secrets_set.outputs.GET_TEST_MERGES_URL
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Prepare module
         if: steps.secrets_set.outputs.GET_TEST_MERGES_URL
         run: |

.github/workflows/tgs_test.yml

@@ -64,7 +64,7 @@ jobs:
           dotnet-version: 8.0.x
 
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Test TGS Integration
         run: dotnet run -c Release --project tools/tgs_test ${{ github.repository }} /tgs_instances/tgstation ${{ env.TGS_API_PORT }} ${{ github.event.pull_request.head.sha || github.sha }} ${{ secrets.GITHUB_TOKEN }} ${{ env.PR_NUMBER }}

.github/workflows/update_tgs_dmapi.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Clone
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Branch
         run: |

_maps/shuttles/arrival_fulp.dmm

@@ -1,6 +1,8 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "b" = (
-/obj/machinery/vending/wallmed/directional/north,
+/obj/machinery/wall_healer/free/directional/north{
+	use_power = 0
+	},
 /turf/open/floor/mineral/titanium/tiled/white,
 /area/shuttle/arrival)
 "e" = (

_maps/shuttles/emergency_theia.dmm

@@ -1006,7 +1006,7 @@
 "SU" = (
 /obj/machinery/light/directional/south,
 /obj/structure/table/reinforced,
-/obj/machinery/vending/wallmed/directional/south,
+/obj/machinery/wall_healer/free/directional/south,
 /turf/open/floor/mineral/titanium/tiled,
 /area/shuttle/escape)
 "SX" = (

fulp_modules/data/html/changelogs/AutoChangeLog-pr-1437.yml

@@ -0,0 +1,4 @@
+author: "QuiteLiterallyAnything"
+delete-after: True
+changes:
+  - bugfix: "Made a sizeable number of fixes to Theia Station. See associated GitHub pull request (presently #1437) for full details."

fulp_modules/features/antagonists/bloodsuckers/code/bloodsucker/bloodsucker_datum.dm

@@ -314,7 +314,9 @@
 /datum/antagonist/bloodsucker/get_preview_icon()
 
 	var/icon/final_icon = render_preview_outfit(/datum/outfit/bloodsucker_outfit)
-	final_icon.Blend(icon('icons/effects/blood.dmi', "uniformblood"), ICON_OVERLAY)
+	var/icon/blood_icon = icon('icons/effects/blood.dmi', "suitblood")
+	blood_icon.Blend(BLOOD_COLOR_RED, ICON_MULTIPLY)
+	final_icon.Blend(blood_icon, ICON_OVERLAY)
 
 	return finish_preview_icon(final_icon)
 

fulp_modules/features/antagonists/bloodsuckers/code/bloodsucker/bloodsucker_integration.dm

@@ -66,7 +66,7 @@
 	enrico.hairstyle = "Undercut"
 	enrico.hair_color = "FFF"
 	enrico.skin_tone = "african2"
-	enrico.eye_color_left = "#663300"
-	enrico.eye_color_right = "#663300"
+	enrico.eye_color_left = COLOR_BLACK
+	enrico.eye_color_right = COLOR_BLACK
 
 	enrico.update_body(is_creating = TRUE)

fulp_modules/features/antagonists/monster_hunter/monsterhunter_datum.dm

@@ -129,7 +129,7 @@
 	l_hand = /obj/item/knife/butcher
 	mask = /obj/item/clothing/mask/monster_preview_mask
 	uniform = /obj/item/clothing/under/suit/black
-	suit =  /obj/item/clothing/suit/hooded/techpriest
+	suit =  /obj/item/clothing/suit/hooded/techpriest/preview
 	gloves = /obj/item/clothing/gloves/color/white
 
 /// Mind version
@@ -247,10 +247,14 @@
 	invasion.run_event()
 
 /obj/item/clothing/mask/monster_preview_mask
-	name = "Monster Preview Mask"
+	name = "Rabbit Mask"
+	icon =  'fulp_modules/icons/antagonists/monster_hunter/weapons.dmi'
 	worn_icon = 'fulp_modules/icons/antagonists/monster_hunter/worn_mask.dmi'
-	worn_icon_state = "monoclerabbit"
+	worn_icon_state = "rabbitmask_preview"
 
+/obj/item/clothing/suit/hooded/techpriest/preview
+	name = "hoodless " + parent_type::name
+	hoodtype = null
 
 /datum/antagonist/monsterhunter/roundend_report()
 	var/list/parts = list()

fulp_modules/mapping/areas/areas.dm

@@ -60,6 +60,16 @@
 	icon = 'fulp_modules/icons/mapping/areas.dmi'
 	icon_state = "lower_entry"
 
+/area/station/hallway/primary/central/port
+	name = "\improper Port Central Primary Hallway"
+	icon = 'fulp_modules/icons/mapping/areas.dmi'
+	icon_state = "hall_central_port"
+
+/area/station/hallway/primary/central/starboard
+	name = "\improper Starboard Central Primary Hallway"
+	icon = 'fulp_modules/icons/mapping/areas.dmi'
+	icon_state = "hall_central_starboard"
+
 /area/station/maintenance/department/security/dungeon
 	name = "\improper Dungeon"