Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
174eddb
Update is_helpers.dm
ChesterTheCheesy Dec 14, 2021
14baad4
Update role_preferences.dm
ChesterTheCheesy Dec 14, 2021
fba5222
Update names.dm
ChesterTheCheesy Dec 14, 2021
4e866c0
Add files via upload
ChesterTheCheesy Dec 14, 2021
25f1079
Update miscellaneous.dm
ChesterTheCheesy Dec 14, 2021
f8b4f13
Update sql_ban_system.dm
ChesterTheCheesy Dec 14, 2021
3bb37d3
Update headcrab.dm
ChesterTheCheesy Dec 14, 2021
de0f4f0
Update panacea.dm
ChesterTheCheesy Dec 14, 2021
739e7bf
Update suicide.dm
ChesterTheCheesy Dec 14, 2021
19b49f2
Update suicide.dm
ChesterTheCheesy Dec 14, 2021
825fb10
Update brain_item.dm
ChesterTheCheesy Dec 14, 2021
79a1113
Update death.dm
ChesterTheCheesy Dec 14, 2021
107ce13
Update human.dm
ChesterTheCheesy Dec 14, 2021
c429494
Update transform_procs.dm
ChesterTheCheesy Dec 14, 2021
106e2bd
Update organ_manipulation.dm
ChesterTheCheesy Dec 14, 2021
d860d96
Update uplink_items.dm
ChesterTheCheesy Dec 14, 2021
b6f465b
Create horror.dm
ChesterTheCheesy Dec 14, 2021
7fc6b04
Add files via upload
ChesterTheCheesy Dec 14, 2021
f396a6b
Add files via upload
ChesterTheCheesy Dec 14, 2021
e15f439
Add files via upload
ChesterTheCheesy Dec 14, 2021
18c04b3
Add files via upload
ChesterTheCheesy Dec 14, 2021
872dd1e
Add files via upload
ChesterTheCheesy Dec 14, 2021
98274fd
Add files via upload
ChesterTheCheesy Dec 14, 2021
7cce84e
Add files via upload
ChesterTheCheesy Dec 14, 2021
cf0269d
Add files via upload
ChesterTheCheesy Dec 14, 2021
087b5cc
adds horror-related item icons
ChesterTheCheesy Dec 14, 2021
ae7f39e
adds horror names
ChesterTheCheesy Dec 14, 2021
2bb17b1
Horror mutation menu
ChesterTheCheesy Dec 14, 2021
696a7e0
Adds eldritch horror
ChesterTheCheesy Dec 14, 2021
83c54f0
Putting tentacles over anime-related phobias
ChesterTheCheesy Dec 14, 2021
5ce2870
fixes ambigous code
ChesterTheCheesy Dec 14, 2021
4ff5ccf
Update headcrab.dm
ChesterTheCheesy Dec 14, 2021
9e8ae9e
Update panacea.dm
ChesterTheCheesy Dec 14, 2021
2240321
Un-spans horror.dm
ChesterTheCheesy Dec 14, 2021
1816c97
yeet
ChesterTheCheesy Dec 14, 2021
047101c
Span-be-gone, part duo
ChesterTheCheesy Dec 14, 2021
60e5d57
not my code but might as well fix
ChesterTheCheesy Dec 14, 2021
b778053
Spanneningings
ChesterTheCheesy Dec 14, 2021
bceb290
that oughta do it
ChesterTheCheesy Dec 14, 2021
28d2b65
p a i n
ChesterTheCheesy Dec 14, 2021
a781687
A a A a
ChesterTheCheesy Dec 14, 2021
2448ba0
a
ChesterTheCheesy Dec 14, 2021
c0bb5bc
Makes bibby happy
ChesterTheCheesy Dec 15, 2021
40e0484
Bibby please
ChesterTheCheesy Dec 15, 2021
03eb12d
Makes abilities associated by typepaths
ChesterTheCheesy Dec 15, 2021
f71f1c0
Typepathing
ChesterTheCheesy Dec 15, 2021
b34dd63
why didn't tgui update?
ChesterTheCheesy Dec 16, 2021
7a27761
fixes broken chat, abilities, and makes revive not appear like change…
ChesterTheCheesy Dec 16, 2021
e473989
can talk back to horror now
ChesterTheCheesy Dec 16, 2021
8a4d59e
trying to enter corpse grabs ghost so we can determine if it has mind…
ChesterTheCheesy Dec 16, 2021
34247a4
nerfs unupgraded knockdown ability
ChesterTheCheesy Dec 17, 2021
bb1fd84
adv. health scan shows horror and explains how to remove it
ChesterTheCheesy Dec 17, 2021
fa0766e
nerfs hp upgrade to double instead of tripling it
ChesterTheCheesy Dec 17, 2021
ab92bea
soul consuming objective check now works properly
ChesterTheCheesy Dec 17, 2021
7c67e7d
you can no longer infect people while dead
ChesterTheCheesy Dec 17, 2021
4a37bd9
fixes horror communication to use real host name
ChesterTheCheesy Dec 18, 2021
b5baf66
fixes pinpointer not working while controlling
ChesterTheCheesy Dec 18, 2021
9b9cc0b
adds ''"Spaghetti friend"'' as one of horror names
ChesterTheCheesy Dec 18, 2021
9c222ba
makes host brain have their own name
ChesterTheCheesy Dec 20, 2021
ccd1dfa
Fixes trapped brain talking to unconcious people
ChesterTheCheesy Dec 20, 2021
79ffe72
fixed accidentally broken headcrab code
ChesterTheCheesy Dec 20, 2021
bc51b44
Makes horror not melt instantly on atmos
ChesterTheCheesy Dec 21, 2021
3139b8a
helikopter helikopter
ChesterTheCheesy Dec 21, 2021
4949ac8
adds ability to throw lube around you, costs 1 point to unlock, 30 ch…
ChesterTheCheesy Dec 21, 2021
c69b229
makes horrorcopter look more dynamic
ChesterTheCheesy Dec 21, 2021
3478e81
adds lube spill action icon
ChesterTheCheesy Dec 21, 2021
2115229
should fix the glue issue
ChesterTheCheesy Dec 21, 2021
3eae1c6
adds item trait for horror glue
ChesterTheCheesy Dec 22, 2021
21b41c5
makes horror glue your clothes for duration of mind control
ChesterTheCheesy Dec 22, 2021
2247d70
horror can no longer force you to shoot yourself
ChesterTheCheesy Dec 22, 2021
8be06ce
fixes horror split personality bug
ChesterTheCheesy Dec 26, 2021
d6732a8
fixes it for good
ChesterTheCheesy Dec 26, 2021
758b430
fixed talking to horror to show correct players name
ChesterTheCheesy Dec 30, 2021
e44d7bc
no more merge conflicts
ChesterTheCheesy Jan 2, 2022
7d2f33f
okay merge conflict, you wanna fight?
ChesterTheCheesy Jan 2, 2022
84a61d1
then a fight you gonna get
ChesterTheCheesy Jan 2, 2022
a5e4a35
Delete screen_gen.dmi
ChesterTheCheesy Jan 2, 2022
7d40327
Add files via upload
ChesterTheCheesy Jan 2, 2022
6cbe2cc
Add files via upload
ChesterTheCheesy Jan 2, 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 @@ -113,6 +113,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
17 changes: 17 additions & 0 deletions code/_onclick/hud/horror.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/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()
. = ..()
chemical_counter = null
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 = 0
duration = 20
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>head organ manipulation surgery</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: 3 additions & 0 deletions code/modules/antagonists/changeling/powers/headcrab.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
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()
if(H)
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