Eldritch horror - the final PR (#13033)

* Update is_helpers.dm

* Update role_preferences.dm

* Update traits.dm

* Update names.dm

* Update traumas.dm

* Update miscellaneous.dm

* Update scanners.dm

* Update sql_ban_system.dm

* Add files via upload

* Update headcrab.dm

* Update panacea.dm

* Create e

* Delete e

* adds horror

* Add files via upload

* Update suicide.dm

* Add files via upload

* Update brain_item.dm

* Update death.dm

* Update human.dm

* Update transform_procs.dm

* Update gun.dm

* Update organ_manipulation.dm

* Update uplink_items.dm

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Create horror.txt

* Add files via upload

* Update yogstation.dme

* adds horror-relatated tips

* fixes a typo

* Update code/_onclick/hud/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/game/objects/effects/temporary_visuals/miscellaneous.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/game/objects/effects/temporary_visuals/miscellaneous.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update scanners.dm

* Update code/modules/antagonists/changeling/powers/headcrab.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* i hope this won't break again

* actually makes horror unable to force lings to suicide

* fixes duplicate definition

* Not needed, changeling code already checks for that

* Cleans up a lot of code

* thank you theos for absolutely nerfing the crap out of horror tentacle

* cleans up a lot of bibby's suggestions and fixes a few bugs

* not sure if i changed anything in this file, but fuck it

* lets fix that merge conflict

* i sure hope github doesn't go nuclear

* oops made horror unable to work

* i hate logic gates

* sorry for commit spam but this thing literally broke horror and i wanna fix it as soon as possibles

* HAHA STUPID DE MORGAN! (tested works as intended)

* abominations summoned by curator horn should not attack horror anymore

* adds missing "

* cannot use lube ability whilst dead anymore

* Update horror_abilities_and_upgrades.dm

* flailing lube stops when you're killed while doing it

* fixes ordering so you can't get stuck in wrong animation at the last spin

* Horror can no longer squeeze through welded airlocks

* Infesting people is now assigned to Alt+Click

* makes tentacle arm no longer affected by range multipliers

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
This commit is contained in:
ChesterTheCheesy
2022-02-02 19:44:08 +01:00
committed by GitHub
parent 56aaf483c4
commit 4d369ae1db
38 changed files with 2147 additions and 8 deletions

View File

@@ -46,7 +46,7 @@ SUBSYSTEM_DEF(traumas)
"doctors" = typecacheof(list(/mob/living/simple_animal/bot/medbot)),
"the supernatural" = typecacheof(list(/mob/living/simple_animal/hostile/construct,
/mob/living/simple_animal/hostile/clockwork, /mob/living/simple_animal/drone/cogscarab,
/mob/living/simple_animal/revenant, /mob/living/simple_animal/shade)),
/mob/living/simple_animal/revenant, /mob/living/simple_animal/shade, /mob/living/simple_animal/horror)),
"aliens" = typecacheof(list(/mob/living/carbon/alien, /mob/living/simple_animal/slime)),
"conspiracies" = typecacheof(list(/mob/living/simple_animal/bot/secbot, /mob/living/simple_animal/bot/ed209, /mob/living/simple_animal/drone,
/mob/living/simple_animal/pet/penguin)),
@@ -115,7 +115,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/suit/cultrobes, /obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune,
/obj/item/stack/sheet/runed_metal, /obj/machinery/door/airlock/cult, /obj/singularity/narsie,
/obj/item/soulstone,
/obj/item/soulstone, /obj/item/horrortentacle,
/obj/structure/destructible/clockwork, /obj/item/clockwork, /obj/item/clothing/suit/armor/clockwork,
/obj/item/clothing/glasses/judicial_visor, /obj/effect/clockwork/sigil/, /obj/item/stack/tile/brass,
/obj/machinery/door/airlock/clockwork,
@@ -142,7 +142,7 @@ SUBSYSTEM_DEF(traumas)
"anime" = typecacheof(list(/obj/item/clothing/under/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi,
/obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja,
/obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja, /obj/item/twohanded/vibro_weapon,
/obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja, /obj/item/twohanded/vibro_weapon, /obj/item/horrortentacle,
/obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe))
)