Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
7d73184
Update is_helpers.dm
ChesterTheCheesy Jan 2, 2022
86727c8
Update role_preferences.dm
ChesterTheCheesy Jan 2, 2022
b2b5191
Update traits.dm
ChesterTheCheesy Jan 2, 2022
6c19875
Update names.dm
ChesterTheCheesy Jan 2, 2022
c8eb7f8
Update traumas.dm
ChesterTheCheesy Jan 2, 2022
66edfd5
Update miscellaneous.dm
ChesterTheCheesy Jan 2, 2022
888a422
Update scanners.dm
ChesterTheCheesy Jan 2, 2022
c435f60
Update sql_ban_system.dm
ChesterTheCheesy Jan 2, 2022
c56f709
Add files via upload
ChesterTheCheesy Jan 2, 2022
e7bf2c4
Update headcrab.dm
ChesterTheCheesy Jan 2, 2022
43a5eca
Update panacea.dm
ChesterTheCheesy Jan 2, 2022
f586ee9
Create e
ChesterTheCheesy Jan 2, 2022
5b2a2ef
Delete e
ChesterTheCheesy Jan 2, 2022
27a1341
adds horror
ChesterTheCheesy Jan 2, 2022
d668eb6
Add files via upload
ChesterTheCheesy Jan 2, 2022
a63cb52
Update suicide.dm
ChesterTheCheesy Jan 2, 2022
9bafe55
Add files via upload
ChesterTheCheesy Jan 2, 2022
5fbebd9
Update brain_item.dm
ChesterTheCheesy Jan 2, 2022
f2a2c4d
Update death.dm
ChesterTheCheesy Jan 2, 2022
d1555ae
Update human.dm
ChesterTheCheesy Jan 2, 2022
6da9e98
Update transform_procs.dm
ChesterTheCheesy Jan 2, 2022
65dc4fc
Update gun.dm
ChesterTheCheesy Jan 2, 2022
a28fa91
Update organ_manipulation.dm
ChesterTheCheesy Jan 2, 2022
14e029c
Update uplink_items.dm
ChesterTheCheesy Jan 2, 2022
e19b4a3
Add files via upload
ChesterTheCheesy Jan 2, 2022
1b9579c
Add files via upload
ChesterTheCheesy Jan 2, 2022
a1a64f9
Add files via upload
ChesterTheCheesy Jan 2, 2022
1df5eb2
Add files via upload
ChesterTheCheesy Jan 2, 2022
706018d
Add files via upload
ChesterTheCheesy Jan 2, 2022
4dbc9af
Add files via upload
ChesterTheCheesy Jan 2, 2022
4fb08f4
Add files via upload
ChesterTheCheesy Jan 2, 2022
8242ca3
Create horror.txt
ChesterTheCheesy Jan 2, 2022
d33ee97
Add files via upload
ChesterTheCheesy Jan 2, 2022
3884c01
Update yogstation.dme
ChesterTheCheesy Jan 2, 2022
f37bbab
adds horror-relatated tips
ChesterTheCheesy Jan 2, 2022
db9fb8f
fixes a typo
ChesterTheCheesy Jan 2, 2022
6cded2d
Update code/_onclick/hud/horror.dm
ChesterTheCheesy Jan 3, 2022
a1b07e5
Update code/game/objects/effects/temporary_visuals/miscellaneous.dm
ChesterTheCheesy Jan 3, 2022
7c31330
Update code/game/objects/effects/temporary_visuals/miscellaneous.dm
ChesterTheCheesy Jan 3, 2022
a9cbe4d
Update code/modules/antagonists/horror/horror.dm
ChesterTheCheesy Jan 3, 2022
7f42109
Update code/modules/antagonists/horror/horror.dm
ChesterTheCheesy Jan 3, 2022
a46c986
Update code/modules/antagonists/horror/horror.dm
ChesterTheCheesy Jan 3, 2022
a52ca54
Update code/modules/antagonists/horror/horror.dm
ChesterTheCheesy Jan 3, 2022
5dad1f0
Update code/modules/antagonists/horror/horror.dm
ChesterTheCheesy Jan 3, 2022
e593aec
Update code/modules/antagonists/horror/horror.dm
ChesterTheCheesy Jan 3, 2022
81ab989
Update code/modules/antagonists/horror/horror.dm
ChesterTheCheesy Jan 3, 2022
2d4745c
Update scanners.dm
ChesterTheCheesy Jan 3, 2022
329ba94
Update code/modules/antagonists/changeling/powers/headcrab.dm
ChesterTheCheesy Jan 5, 2022
3e12a58
i hope this won't break again
ChesterTheCheesy Jan 5, 2022
2176c66
actually makes horror unable to force lings to suicide
ChesterTheCheesy Jan 5, 2022
6f5a83d
fixes duplicate definition
ChesterTheCheesy Jan 5, 2022
1e9c44f
Not needed, changeling code already checks for that
ChesterTheCheesy Jan 5, 2022
028a011
Cleans up a lot of code
ChesterTheCheesy Jan 5, 2022
d26bbd0
thank you theos for absolutely nerfing the crap out of horror tentacle
ChesterTheCheesy Jan 5, 2022
a27bb55
cleans up a lot of bibby's suggestions and fixes a few bugs
ChesterTheCheesy Jan 14, 2022
16b900f
not sure if i changed anything in this file, but fuck it
ChesterTheCheesy Jan 14, 2022
b8a0c10
lets fix that merge conflict
ChesterTheCheesy Jan 14, 2022
1916960
Merge branch 'master' into horror_finale
ChesterTheCheesy Jan 14, 2022
81d204f
i sure hope github doesn't go nuclear
ChesterTheCheesy Jan 14, 2022
0859cf3
oops made horror unable to work
ChesterTheCheesy Jan 17, 2022
11bdc4f
i hate logic gates
ChesterTheCheesy Jan 17, 2022
f395bd7
sorry for commit spam but this thing literally broke horror and i wan…
ChesterTheCheesy Jan 17, 2022
633809f
HAHA STUPID DE MORGAN! (tested works as intended)
ChesterTheCheesy Jan 17, 2022
fa50ec6
abominations summoned by curator horn should not attack horror anymore
ChesterTheCheesy Jan 18, 2022
509b867
adds missing "
ChesterTheCheesy Jan 18, 2022
35bbe93
cannot use lube ability whilst dead anymore
ChesterTheCheesy Jan 18, 2022
1632b3b
Update horror_abilities_and_upgrades.dm
ChesterTheCheesy Jan 18, 2022
e7e2a83
flailing lube stops when you're killed while doing it
ChesterTheCheesy Jan 19, 2022
a3cddac
fixes ordering so you can't get stuck in wrong animation at the last …
ChesterTheCheesy Jan 19, 2022
fa4444b
Horror can no longer squeeze through welded airlocks
ChesterTheCheesy Jan 21, 2022
7a6e830
Infesting people is now assigned to Alt+Click
ChesterTheCheesy Jan 22, 2022
ede372e
makes tentacle arm no longer affected by range multipliers
ChesterTheCheesy Jan 26, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(

#define isrevenant(A) (istype(A, /mob/living/simple_animal/revenant))

#define ishorror(A) (istype(A, /mob/living/simple_animal/horror))

#define isbot(A) (istype(A, /mob/living/simple_animal/bot))

#define isshade(A) (istype(A, /mob/living/simple_animal/shade))
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/role_preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#define ROLE_GANG "gangster" // Yogs
#define ROLE_DARKSPAWN "darkspawn" // Yogs
#define ROLE_HOLOPARASITE "Holoparasite" // Yogs
#define ROLE_HORROR "Eldritch Horror" // Yogs
#define ROLE_INFILTRATOR "Infiltrator" // Yogs
#define ROLE_ZOMBIE "Zombie"

Expand All @@ -63,6 +64,7 @@ GLOBAL_LIST_INIT(special_roles, list(
ROLE_MALF,
ROLE_REV = /datum/game_mode/revolution,
ROLE_ALIEN,
ROLE_HORROR,
ROLE_PAI,
ROLE_CULTIST = /datum/game_mode/cult,
ROLE_BLOB,
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@
#define GUARDIAN_TRAIT "guardian_trait"
#define RANDOM_BLACKOUTS "random_blackouts"
#define MADE_UNCLONEABLE "made-uncloneable"
#define HORROR_TRAIT "horror"

///Traits given by station traits
#define STATION_TRAIT_BANANIUM_SHIPMENTS "station_trait_bananium_shipments"
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/lists/names.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt")
GLOBAL_LIST_INIT(ethereal_names, world.file2list("strings/names/ethereal.txt"))
GLOBAL_LIST_INIT(posibrain_names, world.file2list("strings/names/posibrain.txt"))
GLOBAL_LIST_INIT(nightmare_names, world.file2list("strings/names/nightmare.txt"))
GLOBAL_LIST_INIT(horror_names, world.file2list("strings/names/horror.txt"))
GLOBAL_LIST_INIT(megacarp_first_names, world.file2list("strings/names/megacarp1.txt"))
GLOBAL_LIST_INIT(megacarp_last_names, world.file2list("strings/names/megacarp2.txt"))

Expand Down
18 changes: 18 additions & 0 deletions code/_onclick/hud/horror.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/obj/screen/horror_chemicals
name = "chemicals"
icon_state = "horror_counter"
screen_loc = ui_lingchemdisplay

/datum/hud/chemical_counter
ui_style = 'icons/mob/screen_midnight.dmi'
var/obj/screen/horror_chemicals/chemical_counter

/datum/hud/chemical_counter/New(mob/owner)
. = ..()
chemical_counter = new /obj/screen/horror_chemicals
infodisplay += chemical_counter

/datum/hud/chemical_counter/Destroy()
. = ..()
QDEL_NULL(chemical_counter)

6 changes: 3 additions & 3 deletions code/controllers/subsystem/traumas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down Expand Up @@ -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,
Expand All @@ -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))
)

Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/effects/temporary_visuals/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -483,3 +483,8 @@
layer = FLY_LAYER
duration = 0.48 SECONDS
mouse_opacity = 0

/obj/effect/temp_visual/summon
randomdir = FALSE
duration = 2 SECONDS
icon_state = "summon"
3 changes: 3 additions & 0 deletions code/game/objects/items/devices/scanners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,9 @@ GENE SCANNER
to_chat(user, "\t[span_info("Subject is allergic to the chemical [C.allergies].")]")
if(advanced)
to_chat(user, "\t[span_info("Brain Activity Level: [(200 - M.getOrganLoss(ORGAN_SLOT_BRAIN))/2]%.")]")
if(M.has_horror_inside())
to_chat(user, "\t[span_alert("Detected parasitic organism residing in the cranial area.")]")
to_chat(user, "\t[span_alert("Recommended course of action: <b>organ manipulation surgery performed on head.</b>.")]")

if (M.radiation)
to_chat(user, "\t[span_alert("Subject is irradiated.")]")
Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/sql_ban_system.dm
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,10 @@
break_counter++
output += "</div></div>"
var/list/long_job_lists = list("Civilian" = GLOB.original_civilian_positions,
"Ghost and Other Roles" = list(ROLE_BRAINWASHED, ROLE_DEATHSQUAD, ROLE_DRONE, ROLE_FUGITIVE, ROLE_HOLOPARASITE, ROLE_LAVALAND, ROLE_MIND_TRANSFER, ROLE_POSIBRAIN, ROLE_SENTIENCE),
"Ghost and Other Roles" = list(ROLE_BRAINWASHED, ROLE_DEATHSQUAD, ROLE_DRONE, ROLE_FUGITIVE, ROLE_HOLOPARASITE, ROLE_HORROR, ROLE_LAVALAND, ROLE_MIND_TRANSFER, ROLE_POSIBRAIN, ROLE_SENTIENCE),
"Antagonist Positions" = list(ROLE_ABDUCTOR, ROLE_ALIEN, ROLE_BLOB,
ROLE_BROTHER, ROLE_CHANGELING, ROLE_CULTIST,
ROLE_DEVIL, ROLE_FUGITIVE, ROLE_HOLOPARASITE, ROLE_INTERNAL_AFFAIRS, ROLE_MALF,
ROLE_DEVIL, ROLE_FUGITIVE, ROLE_HOLOPARASITE, ROLE_HORROR, ROLE_INTERNAL_AFFAIRS, ROLE_MALF,
ROLE_MONKEY, ROLE_NINJA, ROLE_OPERATIVE,
ROLE_REV, ROLE_REVENANT,
ROLE_REV_HEAD, ROLE_SERVANT_OF_RATVAR, ROLE_SYNDICATE,
Expand Down
3 changes: 2 additions & 1 deletion code/modules/antagonists/changeling/powers/headcrab.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
dna_cost = 1
req_human = 1
ignores_fakedeath = TRUE
req_stat = DEAD

/datum/action/changeling/headcrab/sting_action(mob/user)
set waitfor = FALSE
Expand All @@ -33,6 +32,8 @@
to_chat(S, span_userdanger("Your sensors are disabled by a shower of blood!"))
S.Paralyze(60)
var/turf = get_turf(user)
var/mob/living/simple_animal/horror/H = user.has_horror_inside()
H?.leave_victim()
user.gib()
. = TRUE
sleep(5) // So it's not killed in explosion
Expand Down
7 changes: 7 additions & 0 deletions code/modules/antagonists/changeling/powers/panacea.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
//Heals the things that the other regenerative abilities don't.
/datum/action/changeling/panacea/sting_action(mob/user)
to_chat(user, span_notice("We cleanse impurities from our form."))
var/mob/living/simple_animal/horror/H = user.has_horror_inside()
if(H)
H.leave_victim()
if(iscarbon(user))
var/mob/living/carbon/C = user
C.vomit(0, toxic = TRUE)
to_chat(user, span_notice("A parasite exits our form."))
..()
var/list/bad_organs = list(
user.getorgan(/obj/item/organ/body_egg),
Expand Down
Loading