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
80 commits
Select commit Hold shift + click to select a range
371afef
Update is_helpers.dm
ChesterTheCheesy Apr 14, 2021
26028e7
Add files via upload
ChesterTheCheesy Apr 14, 2021
3a4ff49
Update horror.dm
ChesterTheCheesy Apr 14, 2021
85df09b
Update role_preferences.dm
ChesterTheCheesy Apr 14, 2021
e664833
Update sql_ban_system.dm
ChesterTheCheesy Apr 14, 2021
e67e67a
Update death.dm
ChesterTheCheesy Apr 14, 2021
67ea8c2
Add files via upload
ChesterTheCheesy Apr 14, 2021
6dd9467
Add files via upload
ChesterTheCheesy Apr 14, 2021
b620085
Add files via upload
ChesterTheCheesy Apr 14, 2021
6750d9e
Add files via upload
ChesterTheCheesy Apr 14, 2021
f9dddc5
Add files via upload
ChesterTheCheesy Apr 14, 2021
7bfaa6d
Add files via upload
ChesterTheCheesy Apr 14, 2021
948c7a2
Add files via upload
ChesterTheCheesy Apr 14, 2021
437c097
Update body.dm
ChesterTheCheesy Apr 14, 2021
3d2dec5
Update panacea.dm
ChesterTheCheesy Apr 14, 2021
791acbd
Update suicide.dm
ChesterTheCheesy Apr 14, 2021
4ffe9af
Update brain_item.dm
ChesterTheCheesy Apr 14, 2021
8e01516
Update human.dm
ChesterTheCheesy Apr 14, 2021
1f97225
Update organ_manipulation.dm
ChesterTheCheesy Apr 14, 2021
a56652e
Add files via upload
ChesterTheCheesy Apr 14, 2021
c1e9eb4
Update miscellaneous.dm
ChesterTheCheesy Apr 14, 2021
3e7c92f
Update uplink_kits.dm
ChesterTheCheesy Apr 14, 2021
0173b22
Update uplink_items.dm
ChesterTheCheesy Apr 14, 2021
05eed39
Add files via upload
ChesterTheCheesy Apr 14, 2021
c741274
bring
ChesterTheCheesy Apr 14, 2021
7629d43
Adds horror
ChesterTheCheesy Apr 14, 2021
f235ef2
Merge pull request #1 from yogstation13/master
ChesterTheCheesy Apr 15, 2021
d9ee07c
Delete items_and_weapons.dmi
ChesterTheCheesy Apr 15, 2021
4108103
Add files via upload
ChesterTheCheesy Apr 15, 2021
ea67f9c
Merge pull request #2 from ChesterTheCheesy/master
ChesterTheCheesy Apr 15, 2021
d35d968
Add files via upload
ChesterTheCheesy Apr 15, 2021
fedd665
woops fuck borers
ChesterTheCheesy Apr 15, 2021
c107083
Add files via upload
ChesterTheCheesy Apr 15, 2021
247d857
adds horror names
ChesterTheCheesy Apr 15, 2021
7d973c4
Update horror.dm
ChesterTheCheesy Apr 15, 2021
0889a18
should work now (hopefully)[please]
ChesterTheCheesy Apr 15, 2021
6d7e702
Update organ_manipulation.dm
ChesterTheCheesy Apr 15, 2021
9dbe9ac
Update horror.dm
ChesterTheCheesy Apr 15, 2021
e005675
Update horror.dm
ChesterTheCheesy Apr 15, 2021
9bcd65f
updates icons
ChesterTheCheesy Apr 25, 2021
0cbe52e
Add files via upload
ChesterTheCheesy Apr 25, 2021
1576119
EEEEEEE
ChesterTheCheesy Apr 25, 2021
98ae77a
brrrr
ChesterTheCheesy Apr 25, 2021
3d1b7d0
i hate git
ChesterTheCheesy Apr 25, 2021
f8b3a24
Merge pull request #4 from yogstation13/master
ChesterTheCheesy Apr 25, 2021
043f010
mmmmmmerrggggeeeee
ChesterTheCheesy Apr 25, 2021
fb7587b
makes horror unobtainable
ChesterTheCheesy Apr 28, 2021
feed21f
Add files via upload
ChesterTheCheesy Apr 29, 2021
ace0439
Add files via upload
ChesterTheCheesy Apr 29, 2021
e0692ff
Add files via upload
ChesterTheCheesy Apr 29, 2021
aa83642
REEEEE
ChesterTheCheesy Apr 29, 2021
4562dec
AAAAA
ChesterTheCheesy Apr 29, 2021
9f9f713
Merge pull request #6 from yogstation13/master
ChesterTheCheesy Apr 29, 2021
739229f
once again adds horror items
ChesterTheCheesy Apr 29, 2021
70e84a3
should not freak out anymore
ChesterTheCheesy Apr 29, 2021
faa419a
good now i swear
ChesterTheCheesy Apr 29, 2021
487cef2
fixes spelling mistakes and allows the horror box to be bought for cu…
ChesterTheCheesy Apr 29, 2021
103b433
Update code/modules/antagonists/horror/horror_chemicals.dm
ChesterTheCheesy Apr 29, 2021
078afc2
Update code/game/objects/items/storage/uplink_kits.dm
ChesterTheCheesy Apr 29, 2021
c94c5a8
enables the event spawn
ChesterTheCheesy Apr 29, 2021
04ee7a2
Add files via upload
ChesterTheCheesy Apr 29, 2021
a8bb82a
makes the code cleaner
ChesterTheCheesy May 5, 2021
0748efa
Update body.dm
ChesterTheCheesy May 5, 2021
45b33d2
Update suicide.dm
ChesterTheCheesy May 5, 2021
f0feeb9
Update brain_item.dm
ChesterTheCheesy May 5, 2021
f9efe95
Update human.dm
ChesterTheCheesy May 5, 2021
52fb279
Update organ_manipulation.dm
ChesterTheCheesy May 5, 2021
8009330
adds a new file to make code cleaner
ChesterTheCheesy May 5, 2021
56fdd71
Update panacea.dm
ChesterTheCheesy May 5, 2021
ae67cec
Update horror.dm
ChesterTheCheesy May 5, 2021
720b639
fixes the inability to search for souls
ChesterTheCheesy May 6, 2021
ea14a8a
you can now force yourself through airlocks
ChesterTheCheesy May 6, 2021
1d30356
Update body.dm
ChesterTheCheesy May 6, 2021
8943856
Update transform_procs.dm
ChesterTheCheesy May 6, 2021
db3d2bb
horror now stops you from returning to monke
ChesterTheCheesy May 6, 2021
e6e0132
Lings cannot instantly gib the horror anymore
ChesterTheCheesy May 6, 2021
8c954c5
Makes brain controlling more persistent
ChesterTheCheesy May 7, 2021
be8f71d
adds icon for host transfer
ChesterTheCheesy May 7, 2021
348c2c9
adds a new ability - transfering directly between hosts
ChesterTheCheesy May 7, 2021
6c897df
removes funni name
ChesterTheCheesy May 8, 2021
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 @@ -111,6 +111,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 @@ -45,6 +45,7 @@
#define ROLE_GANG "gangster" // Yogs
#define ROLE_DARKSPAWN "darkspawn" //Yogs
#define ROLE_HOLOPARASITE "Holoparasite" // Yogs
#define ROLE_HORROR "Eldritch Horror" // 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/_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
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 @@ -476,3 +476,8 @@
/obj/effect/temp_visual/dir_setting/space_wind/Initialize(mapload, set_dir, set_alpha = 255)
. = ..()
alpha = set_alpha

/obj/effect/temp_visual/summon
randomdir = 0
duration = 20
icon_state = "summon"
13 changes: 13 additions & 0 deletions code/game/objects/items/storage/uplink_kits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -598,3 +598,16 @@
/obj/item/storage/box/syndie_kit/bee_grenades/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/grenade/spawnergrenade/buzzkill(src)

/obj/item/storage/box/syndie_kit/horror
name = "horror-in-a-box"
illustration = "writing_syndie"
desc = "A sleek, sturdy box with tentacles slithering from the inside. Uh oh."

obj/item/storage/box/syndie_kit/horror/PopulateContents()
var/datum/reagent/W = pick(/datum/reagent/water/holywater, /datum/reagent/consumable/garlic, /datum/reagent/consumable/ketchup, /datum/reagent/consumable/eggyolk, /datum/reagent/consumable/sodiumchloride, /datum/reagent/consumable/hot_ramen)
W = new W
var/obj/item/horrorspawner/C = new /obj/item/horrorspawner(src)
C.weakness = W
var/obj/item/paper/crumpled/horrorweakness/N = new /obj/item/paper/crumpled/horrorweakness(src)
N.info = "..it's weakness...is...[W.name]...do.....not....<br>....let....it...."
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.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_OVERTHROW, 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 @@ -32,6 +32,9 @@
to_chat(S, "<span class='userdanger'>Your sensors are disabled by a shower of blood!</span>")
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 class='notice'>We cleanse impurities from our form.</span>")
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 class='notice'>A parasite exits our form.</span>")
..()
var/list/bad_organs = list(
user.getorgan(/obj/item/organ/body_egg),
Expand Down
Loading