mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
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:
@@ -2010,6 +2010,17 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
|
||||
cost = 20
|
||||
restricted_roles = list("Chaplain")
|
||||
surplus = 5 //Very low chance to get it in a surplus crate even without being the chaplain
|
||||
|
||||
/datum/uplink_item/role_restricted/horror
|
||||
name = "Horror-in-a-box"
|
||||
desc = "When dissecting the head of a dead Nanotrasen scientist, our surgeons noticed an incredibly peculiar creature inside and managed to extract it into safe containment. \
|
||||
Either a failed experiment or otherworldly monster, this creature has been trained to aid whoever wakes it up. If you aren't afraid of it entering your head, it can prove a useful ally. \
|
||||
We take no responsibility for your newfound madness and accept no refunds."
|
||||
item = /obj/item/horrorspawner
|
||||
cost = 16
|
||||
surplus = 0
|
||||
restricted_roles = list("Curator")
|
||||
player_minimum = 20
|
||||
|
||||
/datum/uplink_item/role_restricted/explosive_hot_potato
|
||||
name = "Exploding Hot Potato"
|
||||
|
||||
Reference in New Issue
Block a user