From 07682b71b3efe80435887ee411eb14873e785efc Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Sat, 22 May 2021 10:28:06 -0400 Subject: [PATCH] shoujo --- .merge_file_a11000 | Bin 0 -> 10763 bytes .merge_file_b11000 | Bin 0 -> 9984 bytes .merge_file_c11000 | Bin 0 -> 11027 bytes code/_onclick/hud/simple_animal.dm | 15 +++++++++++++++ html/changelogs/AutoChangeLog-pr-14716.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-14739.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-14742.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-14743.yml | 4 ++++ 8 files changed, 33 insertions(+) create mode 100644 .merge_file_a11000 create mode 100644 .merge_file_b11000 create mode 100644 .merge_file_c11000 create mode 100644 code/_onclick/hud/simple_animal.dm create mode 100644 html/changelogs/AutoChangeLog-pr-14716.yml create mode 100644 html/changelogs/AutoChangeLog-pr-14739.yml create mode 100644 html/changelogs/AutoChangeLog-pr-14742.yml create mode 100644 html/changelogs/AutoChangeLog-pr-14743.yml diff --git a/.merge_file_a11000 b/.merge_file_a11000 new file mode 100644 index 0000000000000000000000000000000000000000..a8209f25c5a9eb4e60aae2eb2e659753c1770d69 GIT binary patch literal 10763 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 literal 0 HcmV?d00001 diff --git a/.merge_file_b11000 b/.merge_file_b11000 new file mode 100644 index 0000000000000000000000000000000000000000..5fbdedc1717f79c333406a4ac34489c0d178d90b GIT binary patch literal 9984 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 b)MrJSrE8$`hgCxW@OIU}M8D*cbIgALGO#W| literal 0 HcmV?d00001 diff --git a/.merge_file_c11000 b/.merge_file_c11000 new file mode 100644 index 0000000000000000000000000000000000000000..4b10092dc3cc8700b35a08ec4af3de85ed52d719 GIT binary patch literal 11027 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 literal 0 HcmV?d00001 diff --git a/code/_onclick/hud/simple_animal.dm b/code/_onclick/hud/simple_animal.dm new file mode 100644 index 0000000000..ef46c0d66e --- /dev/null +++ b/code/_onclick/hud/simple_animal.dm @@ -0,0 +1,15 @@ +/datum/hud/living/simple_animal + ui_style = 'icons/mob/screen_gen.dmi' +/datum/hud/living/simple_animal/New(mob/living/owner) + ..() + pull_icon = new /obj/screen/pull() + pull_icon.icon = ui_style + pull_icon.update_icon() + pull_icon.screen_loc = ui_living_pull + pull_icon.hud = src + static_inventory += pull_icon + + //mob health doll! assumes whatever sprite the mob is + healthdoll = new /obj/screen/healthdoll/living() + healthdoll.hud = src + infodisplay += healthdoll diff --git a/html/changelogs/AutoChangeLog-pr-14716.yml b/html/changelogs/AutoChangeLog-pr-14716.yml new file mode 100644 index 0000000000..adde6c3940 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14716.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - bugfix: "Antag and species no longer remove all traits if one has a blacklisted trait" diff --git a/html/changelogs/AutoChangeLog-pr-14739.yml b/html/changelogs/AutoChangeLog-pr-14739.yml new file mode 100644 index 0000000000..6d4cab3d48 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14739.yml @@ -0,0 +1,5 @@ +author: "WanderingFox95" +delete-after: True +changes: + - imageadd: "Replaced the antlers showing up when you select deer ears with actual deer ears. Literally why was that even a thing before?" + - imageadd: "Straight rabbit ears are now a thing." diff --git a/html/changelogs/AutoChangeLog-pr-14742.yml b/html/changelogs/AutoChangeLog-pr-14742.yml new file mode 100644 index 0000000000..92fa2489d3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14742.yml @@ -0,0 +1,5 @@ +author: "keronshb" +delete-after: True +changes: + - code_imp: "adds a special hud for simple mobs." + - imageadd: "a lot of >32x32 mobs now have icons for their health dolls" diff --git a/html/changelogs/AutoChangeLog-pr-14743.yml b/html/changelogs/AutoChangeLog-pr-14743.yml new file mode 100644 index 0000000000..50d7981282 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14743.yml @@ -0,0 +1,4 @@ +author: "keronshb" +delete-after: True +changes: + - balance: "30 > 25 pop req for contractor kit"