cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make scientist outfit in antag icons consistent (#67746)

Browse Source 
Fixes an inconsistency where the antag icon would sometimes generate differently.
This commit is contained in:
Mothblocks
2022-06-12 17:39:03 -07:00
committed by GitHub
parent 1706ffa2d3
commit dd3a4cd44a
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/brother/brother.dm
+1 -1
View File
@@ -49,7 +49,7 @@
brother1_icon.Blend(icon('icons/effects/blood.dmi', "maskblood"), ICON_OVERLAY)
brother1_icon.Shift(WEST, 8)
var/icon/brother2_icon = render_preview_outfit(/datum/outfit/job/scientist, brother2)
var/icon/brother2_icon = render_preview_outfit(/datum/outfit/job/scientist/consistent, brother2)
brother2_icon.Blend(icon('icons/effects/blood.dmi', "uniformblood"), ICON_OVERLAY)
brother2_icon.Shift(EAST, 8)
code/modules/jobs/job_types/scientist.dm
+11 -1
View File
@@ -53,9 +53,19 @@
/datum/outfit/job/scientist/pre_equip(mob/living/carbon/human/H)
..()
if(prob(0.4))
try_giving_horrible_tie()
/datum/outfit/job/scientist/proc/try_giving_horrible_tie()
if (prob(0.4))
neck = /obj/item/clothing/neck/tie/horrible
/datum/outfit/job/scientist/get_types_to_preload()
. = ..()
. += /obj/item/clothing/neck/tie/horrible
/// A version of the scientist outfit that is guaranteed to be the same every time
/datum/outfit/job/scientist/consistent
name = "Scientist - Consistent"
/datum/outfit/job/scientist/consistent/try_giving_horrible_tie()
return