From 69df1289f14e0fe52e131ea6e64e43b4f06d8849 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 25 Oct 2021 20:04:38 +0200 Subject: [PATCH] Bulwark Fixes Again (#12678) --- code/game/machinery/body_scanner.dm | 2 ++ code/game/objects/items/weapons/handcuffs.dm | 3 +++ .../species/station/vaurca/vaurca_subspecies.dm | 1 + html/changelogs/geeves-bulwark_fixes_again.yml | 8 ++++++++ icons/mob/species/bulwark/cuff.dmi | Bin 0 -> 394 bytes 5 files changed, 14 insertions(+) create mode 100644 html/changelogs/geeves-bulwark_fixes_again.yml create mode 100644 icons/mob/species/bulwark/cuff.dmi diff --git a/code/game/machinery/body_scanner.dm b/code/game/machinery/body_scanner.dm index 99a305a3140..fb298aeddb2 100644 --- a/code/game/machinery/body_scanner.dm +++ b/code/game/machinery/body_scanner.dm @@ -36,6 +36,8 @@ SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, + SPECIES_VAURCA_BREEDER, + SPECIES_VAURCA_BULWARK, SPECIES_DIONA, SPECIES_MONKEY ) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index b3afc1b5ffe..605e00c8a77 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -4,6 +4,9 @@ gender = PLURAL icon = 'icons/obj/handcuffs.dmi' icon_state = "handcuff" + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/cuff.dmi' + ) flags = CONDUCT slot_flags = SLOT_BELT throwforce = 5 diff --git a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm index c97aa069dac..061a159f431 100644 --- a/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm @@ -239,5 +239,6 @@ Bulwarks are much larger and have significantly thicker carapaces than most Vaur slot_r_ear_str = list( "[EAST]" = list("x" = 16, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)), slot_belt_str = list("[NORTH]" = list("x" = 9, "y" = 2), "[EAST]" = list("x" = 10, "y" = 1), "[SOUTH]" = list("x" = 9, "y" = 2), "[WEST]" = list("x" = 6, "y" = 1)), slot_wear_id_str = list("[NORTH]" = list("x" = 0, "y" = 0), "[EAST]" = list("x" = 12, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 0, "y" = 0)), + slot_wrists_str = list("[NORTH]" = list("x" = 15, "y" = 0), "[EAST]" = list("x" = 12, "y" = 0), "[SOUTH]" = list("x" = 4, "y" = 0), "[WEST]" = list("x" = 9, "y" = 0)), slot_shoes_str = list("[NORTH]" = list("x" = 9, "y" = 0), "[EAST]" = list("x" = 8, "y" = 0), "[SOUTH]" = list("x" = 9, "y" = 0), "[WEST]" = list("x" = 8, "y" = 0)) ) diff --git a/html/changelogs/geeves-bulwark_fixes_again.yml b/html/changelogs/geeves-bulwark_fixes_again.yml new file mode 100644 index 00000000000..c78507ae463 --- /dev/null +++ b/html/changelogs/geeves-bulwark_fixes_again.yml @@ -0,0 +1,8 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Bulwarks now have on-mob specific cuff sprites." + - bugfix: "Bulwarks and Breeders can now be properly scanned in a body scanner." + - bugfix: "Bulwark wrist items now get properly offset." \ No newline at end of file diff --git a/icons/mob/species/bulwark/cuff.dmi b/icons/mob/species/bulwark/cuff.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e47ccccd41d9f255654662136bda2dc322d92c34 GIT binary patch literal 394 zcmV;50d@X~P)8)B+7LZ~!EQK_up>gNJ>1ORhq zC!1`FQy~BV0HaAnK~z|U?bS^RgD?;U;Ech&lpbJ|W-q-#Zjk2whiUO=QD>nHuaLs~ zR`IEiS%f46A|fIp`lVakSFsx|{`MYwXkXkx~r$ov)9Fd{G87 z5fKql%LG;Qu=li&D5$6h^@QgPDuPW^&OfZ#d9<19giLoe onQtPozlrVk!QE@19-@Es2DdH?$mY?CY5)KL07*qoM6N<$f}eh