cleaning up

code/controllers/shuttle_controller.dm

@@ -253,6 +253,10 @@ datum/shuttle_controller
 						captain_announce("The Emergency Shuttle has docked with the station. You have [round(timeleft()/60,1)] minutes to board the Emergency Shuttle.")
 						world << sound('sound/AI/shuttledock.ogg')
 
+						if(universe.name == "Hell Rising")
+							world << "___________________________________________________________________"
+							world << "<span class='sinister' style='font-size:3'> A vile force of darkness is making its way toward the escape shuttle.</span>"
+
 						return 1
 
 				if(1)

code/datums/spells/construct_spells.dm

@@ -89,9 +89,8 @@
 			for(var/obj/structure/cult/pylon/P in spawn_place.contents)
 				if(P.isbroken)
 					P.repair(usr)
-					return
-				else
-					return
+				return
+
 			var/atom/summoned_object = new summoned_object_type(spawn_place)
 
 			for(var/varName in newVars)

code/modules/power/singularity/narsie.dm

@@ -356,6 +356,24 @@ var/global/mr_clean_targets = list(
 	icon = 'icons/obj/mrclean.dmi'
 	icon_state = ""
 
+/obj/machinery/singularity/narsie/large/clean/process()
+	eat()
+
+	if (!target || prob(5))
+		pickuptrash()
+
+	move()
+
+	if (prob(25))
+		mezzer()
+
+/obj/machinery/singularity/narsie/large/clean/mezzer()
+	for(var/mob/living/carbon/M in oviewers(8, src))
+		if(M.stat == CONSCIOUS)
+			if(!iscultist(M))
+				M << "<span class='warning'> You take a moment to admire [src.name] hard at work...</span>"
+				M.apply_effect(3, STUN)
+
 /obj/machinery/singularity/narsie/large/clean/update_icon()
 	overlays = 0
 
@@ -405,7 +423,7 @@ var/global/mr_clean_targets = list(
 /*
  * Mr. Clean just follows the dirt and grime.
  */
-/obj/machinery/singularity/narsie/large/clean/pickcultist()
+/obj/machinery/singularity/narsie/large/clean/proc/pickuptrash()
 	var/list/targets = list()
 	for(var/obj/effect/E in world)
 		if(is_type_in_list(E, mr_clean_targets) && E.z == src.z)

html/changelogs/DeityLink.yml

@@ -7,8 +7,7 @@ changes:
   - rscadd: Artificers now have a "Red Pylon" spell. 10 seconds cooldown. Places a Red Pylon (or repair a broken one) under them.<br>Pylons have collisions but can be broken very easily even bare-handed. Their main use is as a light source.
   - tweak: when floor tiles periodically  decay once <span class="redletter">narsie has risen</span>, they will now spawn a Pylon in place of any light fixtures that were on that tile
   - imageadd: <span class="redletter">NARSIE HAS GOTTEN A NEW LOOK</span>, upgraded sprites for narsie, now with twice more pixels!
-  - tweak: moved narsie's code to its own .dm .
-  - rscadd: coded new interactions with the environnement for <span class="redletter">narsie</span>:<br>Floor tiles (except carpets) and Wall tiles are replaced with their cult counterparts.<br>Grilles are replaced with cult walls.<br>Light bulbs are replaced with Red Pylons.<br>Most machines and all computers get replaced by various cult structures, unused up to now.<br>Cultists become constructs on contact with narsie.
+  - rscadd: coded new interactions with the environnement for <span class="redletter">narsie</span>:<br>Floor tiles (except carpets) and Wall tiles are replaced with their cult counterparts.<br>Grilles are replaced with cult walls.<br>Light bulbs are replaced with Red Pylons.<br>Chairs become pretty wooden chairs.<br>Tables become wooden tables.<br>Most machines and all computers get replaced by various cult structures, unused up to now.<br>Cultists become constructs on contact with narsie.
   - tweak: the monsters spawned across the universe once <span class="redletter">narsie has risen</span> aren't affected by narsie, and do not attack constructs or cultists either.
   - rscadd: once the shuttle docks after <span class="redletter">narsie has risen</span>, All the monsters will make their way toward the station's escape hallway.
   - rscadd: added a button in the Admin Secret menu that lets them choose <span class="redletter">narsie</span>'s behaviour (either the above mentionned new interactions, or going back to the old oversized singulo. Defaults with the new interactions).