diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index 3a6c2c1b3c..d6af1a2707 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -39,7 +39,7 @@
if(!isbroken)
if(prob(1+ damage * 5))
user.visible_message(
- "[user] smashed the pylon!",
+ "[user] smashed the pylon!",
"You hit the pylon, and its crystal breaks apart!",
"You hear a tinkle of crystal shards"
)
@@ -137,6 +137,8 @@
var/mob/living/M = A
+ M << "Walking into \the [src] is probably a bad idea, you think."
+/*
if(M.stat != DEAD)
if(M.transforming)
return
@@ -173,3 +175,4 @@
new_mob.key = M.key
new_mob << "Your form morphs into that of a corgi." //Because we don't have cluwnes
+*/
diff --git a/code/game/gamemodes/cult/hell_universe.dm b/code/game/gamemodes/cult/hell_universe.dm
index e81a6a2673..496af98ef8 100644
--- a/code/game/gamemodes/cult/hell_universe.dm
+++ b/code/game/gamemodes/cult/hell_universe.dm
@@ -1,11 +1,8 @@
/*
In short:
- * Random area alarms
- * All areas jammed
- * Random gateways spawning hellmonsters (and turn people into cluwnes if ran into)
- * Broken APCs/Fire Alarms
- * Scary music
+ * Random gateways spawning hellmonsters
+ * Broken Fire Alarms
* Random tiles changing to culty tiles.
*/
@@ -42,7 +39,7 @@ In short:
// Apply changes when entering state
/datum/universal_state/hell/OnEnter()
set background = 1
- garbage_collector.garbage_collect = 0
+// garbage_collector.garbage_collect = 0
escape_list = get_area_turfs(locate(/area/hallway/secondary/exit))
@@ -50,8 +47,8 @@ In short:
AreaSet()
MiscSet()
APCSet()
- KillMobs()
OverlayAndAmbientSet()
+ lightsout(0,0)
runedec += 9000 //basically removing the rune cap
@@ -83,13 +80,5 @@ In short:
/datum/universal_state/hell/proc/APCSet()
for (var/obj/machinery/power/apc/APC in machines)
if (!(APC.stat & BROKEN) && !APC.is_critical)
- APC.chargemode = 0
- if(APC.cell)
- APC.cell.charge = 0
APC.emagged = 1
APC.queue_icon_update()
-
-/datum/universal_state/hell/proc/KillMobs()
- for(var/mob/living/simple_animal/M in mob_list)
- if(M && !M.client)
- M.stat = DEAD
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 3b2345c1be..aafcd791e5 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -196,10 +196,24 @@ var/list/sacrificed = list()
for(var/mob/M in range(1,src))
if(iscultist(M) && !M.stat)
M.say("Tok-lyr rqa'nap g[pick("'","`")]lt-ulotf!")
- cultists += 1
+ if(istype(M, /mob/living/carbon/human/dummy)) //No manifest cheese.
+ continue
+ cultists.Add(M)
if(cultists.len >= 9)
- log_and_message_admins_many(cultists, "summoned Nar-sie.")
- new /obj/singularity/narsie/large(src.loc)
+ if(!narsie_cometh)//so we don't initiate Hell more than one time.
+ world << "THE VEIL HAS BEEN SHATTERED!"
+ world << sound('sound/effects/wind/wind_5_1.ogg')
+
+ SetUniversalState(/datum/universal_state/hell)
+ narsie_cometh = 1
+
+ spawn(10 SECONDS)
+ if(emergency_shuttle)
+ emergency_shuttle.call_evac()
+ emergency_shuttle.launch_time = 0 // Cannot recall
+
+ log_and_message_admins_many(cultists, "summoned the end of days.")
+// new /obj/singularity/narsie/large(src.loc)
return
else
return fizzle()
diff --git a/code/modules/mob/living/simple_animal/hostile/bat.dm b/code/modules/mob/living/simple_animal/hostile/bat.dm
index 2bd3c8984a..9ce3a08a28 100644
--- a/code/modules/mob/living/simple_animal/hostile/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bat.dm
@@ -16,9 +16,9 @@
maxHealth = 20
health = 20
- harm_intent_damage = 8
- melee_damage_lower = 10
- melee_damage_upper = 10
+ harm_intent_damage = 10
+ melee_damage_lower = 3
+ melee_damage_upper = 3
attacktext = "bites"
attack_sound = 'sound/weapons/bite.ogg'
diff --git a/code/modules/mob/living/simple_animal/hostile/creature.dm b/code/modules/mob/living/simple_animal/hostile/creature.dm
index 3ae0876903..af42c6ad2e 100644
--- a/code/modules/mob/living/simple_animal/hostile/creature.dm
+++ b/code/modules/mob/living/simple_animal/hostile/creature.dm
@@ -6,14 +6,15 @@
icon_state = "otherthing"
icon_living = "otherthing"
icon_dead = "otherthing-dead"
- health = 80
- maxHealth = 80
- melee_damage_lower = 25
- melee_damage_upper = 50
+ health = 40
+ maxHealth = 40
+ melee_damage_lower = 5
+ melee_damage_upper = 5
attacktext = "chomped"
attack_sound = 'sound/weapons/bite.ogg'
faction = "creature"
- speed = 4
+ speed = 8
+ harm_intent_damage = 10
/mob/living/simple_animal/hostile/creature/cult
faction = "cult"
diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index 44d9c5d1ac..7b96db183a 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -9,13 +9,13 @@
response_help = "passes through"
response_disarm = "shoves"
response_harm = "hits"
- speed = -1
- maxHealth = 80
- health = 80
+ speed = 8
+ maxHealth = 50
+ health = 50
harm_intent_damage = 10
- melee_damage_lower = 15
- melee_damage_upper = 15
+ melee_damage_lower = 5
+ melee_damage_upper = 5
attacktext = "gripped"
attack_sound = 'sound/hallucinations/growl1.ogg'
@@ -50,6 +50,7 @@
/mob/living/simple_animal/hostile/faithless/cult
faction = "cult"
+ supernatural = 1
/mob/living/simple_animal/hostile/faithless/cult/cultify()
return
diff --git a/html/changelogs/neerti-narsie.yml b/html/changelogs/neerti-narsie.yml
new file mode 100644
index 0000000000..2a4de03b0a
--- /dev/null
+++ b/html/changelogs/neerti-narsie.yml
@@ -0,0 +1,38 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+#################################
+
+# Your name.
+author: Neerti
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscdel: "The rune to summon Narsie has been changed. Narsie is no longer summoned, but Hell still comes."
+ - rscdel: "Spooky mobs spawned from spooky portals as a result of Hell coming have had their speed, health, and damage reduced."
+ - rscdel: "Manifested humans no longer count for summoning Hell."