carpet remove

TauCetiStation · Sep 17, 2024 · f062671 · f062671
1 parent 339a38d
commit f062671
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/code/game/turfs/floor/carpets.dm b/code/game/turfs/floor/carpets.dm
@@ -19,6 +19,11 @@
 /turf/simulated/floor/carpet/make_plating()
 	ChangeTurf(/turf/simulated/floor/plating)
 
+/turf/simulated/floor/carpet/Entered(atom/movable/O)
+	..()
+	if(ishuman(O))
+		SEND_SIGNAL(O, COMSIG_HUMAN_ON_CARPET, src)
+
 /turf/unsimulated/floor/carpet // copypaste because we still have unsim as different type :(
 	name = "red classic carpet"
 	icon_state = "center_8"

diff --git a/code/modules/religion/religion_types/pluvia.dm b/code/modules/religion/religion_types/pluvia.dm
@@ -101,11 +101,6 @@
 /datum/religion/pluvia/proc/custom_haram(mob/living/carbon/human/target, haram_point, reason)
 	adjust_haram(target, haram_point, reason)
 
-/turf/simulated/floor/carpet/Entered(atom/movable/O)
-	..()
-	if(ishuman(O))
-		SEND_SIGNAL(O, COMSIG_HUMAN_ON_CARPET, src)
-
 /datum/religion/pluvia/proc/carpet_haram(mob/living/carbon/human/target)
 	if(!target.shoes || target.lying || target.crawling || target.buckled)
 		return