Fixes fulp antag icons (#1439)

* Fixes fulp antag icons

* test commit

* Revert "test commit"

This reverts commit 93f582dd5b.

* theia fixes

* Update TheiaStation.dmm

_maps/map_files/TheiaStation/TheiaStation.dmm

@@ -645,6 +645,9 @@
 /obj/structure/reagent_dispensers/wall/virusfood/directional/south,
 /obj/effect/turf_decal/trimline/green/filled/line,
 /obj/effect/turf_decal/trimline/green/filled/mid_joiner,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
 /turf/open/floor/iron/white/smooth_edge,
 /area/station/medical/virology)
 "ajJ" = (
@@ -5316,7 +5319,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/machinery/duct,
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "bIT" = (
@@ -6820,8 +6822,15 @@
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/command)
 "ciB" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/effect/turf_decal/tile/green/full,
+/obj/structure/table,
+/obj/item/book/manual/wiki/infections,
+/obj/item/storage/box/beakers,
+/obj/item/storage/box/syringes{
+	pixel_x = -5
+	},
+/obj/item/reagent_containers/syringe/antiviral,
+/obj/item/reagent_containers/dropper,
 /turf/open/floor/iron/white/textured_large,
 /area/station/medical/virology)
 "ciE" = (
@@ -7839,11 +7848,9 @@
 /turf/open/floor/iron/dark,
 /area/station/command/gateway)
 "cBy" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 6
-	},
-/turf/open/misc/hay,
-/area/station/command/heads_quarters/captain)
+/obj/structure/toilet,
+/turf/open/floor/iron/white,
+/area/station/command/heads_quarters/captain/private)
 "cBL" = (
 /obj/machinery/door/airlock/engineering/glass{
 	name = "Supermatter Engine Room"
@@ -12330,6 +12337,12 @@
 	dir = 8
 	},
 /area/station/medical/pharmacy)
+"efj" = (
+/obj/machinery/duct,
+/obj/machinery/light/dim/directional/south,
+/obj/structure/mirror/directional/west,
+/turf/open/floor/iron/white,
+/area/station/command/heads_quarters/captain/private)
 "efw" = (
 /obj/structure/chair/pew/right{
 	dir = 1
@@ -14178,7 +14191,8 @@
 /turf/open/floor/engine/n2,
 /area/station/engineering/atmos)
 "eKg" = (
-/obj/structure/flora/bush/flowers_br/style_random,
+/obj/structure/flora/bush/flowers_yw/style_random,
+/mob/living/basic/pony,
 /turf/open/floor/grass,
 /area/station/command/heads_quarters/captain)
 "eKh" = (
@@ -14481,6 +14495,7 @@
 /turf/open/floor/carpet/executive,
 /area/station/command/meeting_room)
 "ePI" = (
+/obj/machinery/duct,
 /turf/open/floor/iron/white,
 /area/station/medical/treatment_center)
 "ePR" = (
@@ -16300,30 +16315,12 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/starboard)
 "ftD" = (
-/obj/structure/closet/crate/wooden{
-	name = "Apple Box"
-	},
-/obj/item/food/grown/apple{
-	pixel_x = -6;
-	pixel_y = -3
-	},
-/obj/item/food/grown/apple{
-	pixel_y = 3;
-	pixel_x = -4
-	},
-/obj/item/food/grown/apple{
-	pixel_y = -6;
-	pixel_x = 2
-	},
-/obj/item/food/grown/apple{
-	pixel_y = 2;
-	pixel_x = 5
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 5
-	},
-/turf/open/misc/hay,
-/area/station/command/heads_quarters/captain)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/obj/machinery/duct,
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
 "ftK" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -19355,9 +19352,6 @@
 /obj/item/stack/ducts/fifty,
 /obj/item/stack/ducts/fifty,
 /obj/item/stack/ducts/fifty,
-/obj/item/stack/ducts/fifty,
-/obj/item/stack/ducts/fifty,
-/obj/item/stack/ducts/fifty,
 /obj/item/plunger,
 /obj/item/plunger,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -23578,6 +23572,7 @@
 	name = "camera";
 	network = list("ss13","prison")
 	},
+/obj/machinery/duct,
 /turf/open/floor/iron/showroomfloor,
 /area/station/security/prison/toilet)
 "hRz" = (
@@ -25597,7 +25592,6 @@
 /obj/effect/turf_decal/trimline/blue/filled/corner{
 	dir = 4
 	},
-/obj/machinery/duct,
 /obj/structure/disposalpipe/segment,
 /turf/open/floor/iron/white,
 /area/station/medical/treatment_center)
@@ -28246,7 +28240,6 @@
 /area/station/security/prison/rec)
 "jBp" = (
 /obj/effect/turf_decal/tile/yellow/diagonal_centre,
-/obj/machinery/duct,
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/ce)
 "jBu" = (
@@ -30160,7 +30153,6 @@
 	name = "Captain's Stable"
 	},
 /obj/effect/mapping_helpers/airlock/access/any/command/captain,
-/obj/machinery/door/firedoor,
 /obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood/tile,
 /area/station/command/heads_quarters/captain)
@@ -31147,10 +31139,10 @@
 /turf/open/floor/iron/white/smooth_edge,
 /area/station/science/xenobiology)
 "kAQ" = (
-/obj/structure/flora/bush/flowers_yw/style_random,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/grass,
-/area/station/command/heads_quarters/captain)
+/obj/structure/disposalpipe/segment,
+/obj/machinery/duct,
+/turf/open/floor/iron/white,
+/area/station/medical/treatment_center)
 "kAY" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -34758,12 +34750,12 @@
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
 "lPu" = (
-/obj/effect/turf_decal/tile/green/fourcorners,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/airlock{
+	name = "Toilet C"
+	},
 /obj/machinery/duct,
-/turf/open/floor/iron/white,
-/area/station/medical/virology)
+/turf/open/floor/iron/showroomfloor,
+/area/station/commons/toilet/restrooms)
 "lPC" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -34953,10 +34945,10 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/machinery/duct,
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
+/obj/machinery/duct,
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "lTg" = (
@@ -36000,7 +35992,9 @@
 /turf/open/floor/iron,
 /area/station/security/checkpoint/escape)
 "mmA" = (
-/obj/structure/reagent_dispensers/plumbed,
+/obj/structure/reagent_dispensers/plumbed{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/station/maintenance/department/medical/morgue)
 "mmC" = (
@@ -39592,13 +39586,7 @@
 /turf/open/floor/wood/large,
 /area/station/medical/morgue)
 "nBx" = (
-/obj/structure/toilet{
-	dir = 4;
-	pixel_y = -1
-	},
 /obj/machinery/duct,
-/obj/machinery/light/dim/directional/south,
-/obj/structure/mirror/directional/west,
 /turf/open/floor/iron/white,
 /area/station/command/heads_quarters/captain/private)
 "nBy" = (
@@ -42462,24 +42450,8 @@
 /turf/open/floor/wood/large,
 /area/station/security/courtroom)
 "oys" = (
-/obj/item/storage/box/syringes{
-	pixel_x = -5
-	},
-/obj/item/storage/box/beakers,
-/obj/item/reagent_containers/dropper,
-/obj/item/book/manual/wiki/infections,
-/obj/item/reagent_containers/syringe/antiviral,
-/obj/structure/table,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/green/full,
-/obj/structure/cable,
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/open/floor/iron/white/textured_large,
-/area/station/medical/virology)
+/turf/open/floor/wood,
+/area/station/command/heads_quarters/captain)
 "oyu" = (
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron,
@@ -43784,11 +43756,10 @@
 /turf/open/floor/iron/dark,
 /area/station/security/brig/hallway)
 "oWk" = (
-/obj/structure/flora/bush/fullgrass/style_random,
-/obj/structure/flora/bush/flowers_pp/style_random,
-/mob/living/basic/pony,
-/turf/open/floor/grass,
-/area/station/command/heads_quarters/captain)
+/obj/structure/fluff/shower_drain,
+/obj/machinery/shower/directional/west,
+/turf/open/floor/iron/showroomfloor,
+/area/station/security/prison/toilet)
 "oWm" = (
 /obj/machinery/duct,
 /obj/effect/turf_decal/trimline/white/corner{
@@ -51182,6 +51153,7 @@
 /obj/effect/turf_decal/trimline/green/line{
 	dir = 8
 	},
+/obj/structure/sink/directional/south,
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "rDK" = (
@@ -53772,7 +53744,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/machinery/duct,
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "sCD" = (
@@ -54231,7 +54202,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/machinery/duct,
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "sHH" = (
@@ -63348,8 +63318,8 @@
 /area/station/hallway/secondary/exit/departure_lounge)
 "vQt" = (
 /obj/item/soap,
-/obj/machinery/shower/directional/west,
 /obj/structure/fluff/shower_drain,
+/obj/machinery/shower/directional/west,
 /turf/open/floor/iron/showroomfloor,
 /area/station/security/prison/toilet)
 "vQA" = (
@@ -63933,7 +63903,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/machinery/duct,
 /turf/open/floor/iron/white,
 /area/station/medical/virology)
 "wao" = (
@@ -67351,7 +67320,6 @@
 /obj/effect/turf_decal/trimline/blue,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
 /turf/open/floor/iron,
 /area/station/commons/dorms/laundry)
 "xkN" = (
@@ -99431,7 +99399,7 @@ xXM
 iVI
 lXU
 kFF
-lPu
+hPs
 hPs
 xHI
 nql
@@ -99798,7 +99766,7 @@ xcg
 kRT
 wAP
 lGw
-lIl
+lPu
 mqL
 nXM
 vvl
@@ -100312,7 +100280,7 @@ yeV
 kRT
 xKH
 wTS
-lIl
+lPu
 mqL
 nXM
 xBv
@@ -100539,12 +100507,12 @@ sRz
 ogV
 gqM
 oZH
-hET
 lYI
-ftD
-cBy
+lYI
+lYI
+lYI
 eKg
-oWk
+oCp
 qAt
 lYI
 nri
@@ -100797,11 +100765,11 @@ eHy
 lYI
 lYI
 lYI
+qXO
+wjW
 lYI
-lYI
-lYI
-kAQ
-oCp
+wzu
+bFV
 enw
 lYI
 nri
@@ -101054,12 +101022,12 @@ eHy
 bPR
 bQz
 sEY
-qXO
-wjW
-lYI
-wzu
-bFV
-mlS
+wmi
+qOl
+kiy
+frW
+txy
+eBt
 lYI
 nri
 hab
@@ -101265,10 +101233,10 @@ hpj
 eja
 eja
 eja
-eja
-eja
-eja
-eja
+wZS
+wZS
+wZS
+wZS
 wZS
 wZS
 mOk
@@ -101311,12 +101279,12 @@ gDU
 kQQ
 gEl
 aPv
-wmi
-qOl
-kiy
-frW
-txy
-eBt
+oFM
+mWV
+xjj
+xjj
+xjj
+xjj
 lYI
 nri
 hab
@@ -101568,13 +101536,13 @@ iez
 huC
 rKB
 uHK
-oFM
-mWV
+uHK
+oys
 xjj
+oyl
+efj
 xjj
-xjj
-xjj
-lYI
+nri
 nri
 hab
 gud
@@ -101744,7 +101712,7 @@ vQV
 vQV
 nwv
 wrZ
-oys
+ydc
 vcx
 sJj
 elj
@@ -101825,10 +101793,10 @@ eHy
 khr
 pJC
 iHA
-uHK
+oys
 bta
 xjj
-oyl
+cBy
 nBx
 xjj
 nri
@@ -103566,7 +103534,7 @@ qWO
 qdh
 iQW
 gWQ
-sql
+ftD
 xGt
 hhc
 sql
@@ -103823,7 +103791,7 @@ wKP
 eXJ
 rzZ
 iHw
-sIP
+kAQ
 vZF
 ltU
 sIP
@@ -119823,7 +119791,7 @@ vQV
 vQV
 kBM
 vQt
-jdr
+oWk
 jdr
 vlU
 rcp

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()