More misc clown auditing

shiptest-ss13 · Feb 9, 2024 · 443da1a · 443da1a
1 parent 84c6786
commit 443da1a
Show file tree

Hide file tree

Showing 46 changed files with 44 additions and 1,494 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm
@@ -448,13 +448,12 @@
 "lj" = (
 /obj/structure/mecha_wreckage/ripley/mkii,
 /obj/machinery/light/directional/east,
-/turf/open/floor/mech_bay_recharge_floor,
+/turf/open/floor/mech_bay_recharge_floor,q
 /area/ruin/unpowered/corprejectengineering)
 "lk" = (
 /turf/closed/mineral/snowmountain/icemoon,
 /area/ruin/unpowered/corprejectrooms)
 "lF" = (
-/obj/structure/mecha_wreckage/honker/dark,
 /obj/machinery/light/directional/east,
 /turf/open/floor/mech_bay_recharge_floor,
 /area/ruin/unpowered/corprejectengineering)
@@ -1238,7 +1237,6 @@
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/punching_glove,
 /obj/item/mmi/posibrain,
 /obj/item/mmi,
-/obj/item/circuitboard/mecha/honker/main,
 /turf/open/floor/plasteel/tech,
 /area/ruin/unpowered/corprejectengineering)
 "CS" = (
@@ -1613,7 +1611,6 @@
 /area/ruin/unpowered/corprejectengineering)
 "Kk" = (
 /obj/structure/bed,
-/obj/effect/mob_spawn/human/clown/corpse,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/unpowered/corprejectrooms)
 "Kn" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_surface_roommates.dmm b/_maps/RandomRuins/JungleRuins/jungle_surface_roommates.dmm
@@ -24,9 +24,6 @@
 /obj/item/toy/plush/hornet/gay,
 /obj/item/lipstick/random,
 /obj/item/lipstick/random,
-/obj/item/clothing/mask/gas/clown_hat,
-/obj/item/clothing/under/rank/civilian/clown/orange,
-/obj/item/clothing/under/rank/civilian/clown/rainbow,
 /obj/effect/turf_decal/corner/opaque/solgovgold,
 /obj/effect/turf_decal/corner/opaque/lime{
 	dir = 8
@@ -37,7 +34,6 @@
 /obj/effect/turf_decal/corner/opaque/bottlegreen{
 	dir = 4
 	},
-/obj/item/clothing/under/rank/civilian/clown/orange,
 /obj/item/clothing/neck/tie/lesbian,
 /obj/item/bikehorn,
 /obj/effect/decal/cleanable/confetti,
@@ -236,9 +232,6 @@
 /obj/structure/bed{
 	pixel_y = 14
 	},
-/obj/item/bedsheet/clown{
-	pixel_y = 15
-	},
 /obj/effect/turf_decal/corner/opaque/white{
 	dir = 6
 	},

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_dwarffortress.dmm
@@ -194,10 +194,6 @@
 	pixel_x = 5;
 	pixel_y = 6
 	},
-/obj/item/toy/figure/clown{
-	pixel_x = -7;
-	pixel_y = 1
-	},
 /obj/structure/table/wood/fancy/purple,
 /turf/open/floor/plating/asteroid/basalt,
 /area/overmap_encounter/planetoid/cave/explored)

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm
@@ -1029,7 +1029,6 @@
 	pixel_x = -17
 	},
 /obj/effect/decal/remains/human,
-/obj/item/clothing/mask/gas/clown_hat,
 /obj/effect/decal/cleanable/blood/old,
 /obj/item/ammo_casing/a357{
 	pixel_x = 9;

diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_conveniencestore.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_conveniencestore.dmm
@@ -248,10 +248,6 @@
 /area/ruin/unpowered)
 "LZ" = (
 /obj/structure/rack,
-/obj/item/clothing/mask/gas/clown_hat{
-	pixel_y = 6
-	},
-/obj/item/clothing/mask/gas/clown_hat,
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered)
 "Mu" = (
@@ -314,7 +310,6 @@
 /turf/open/floor/plasteel/white,
 /area/ruin/unpowered)
 "Wp" = (
-/obj/structure/sign/poster/contraband/clown,
 /turf/closed/wall,
 /area/ruin/unpowered)
 "Wr" = (

diff --git a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm
@@ -608,7 +608,6 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/powered/macspace)
 "bj" = (
-/obj/item/toy/figure/clown,
 /obj/effect/decal/cleanable/food/tomato_smudge,
 /obj/structure/chair/wood/wings{
 	dir = 4;

diff --git a/_maps/RandomRuins/SpaceRuins/astraeus.dmm b/_maps/RandomRuins/SpaceRuins/astraeus.dmm
@@ -1716,10 +1716,6 @@
 /turf/closed/wall/r_wall,
 /area/ruin/space/has_grav/astraeus/munitions)
 "TS" = (
-/obj/item/clothing/shoes/clown_shoes{
-	pixel_x = -3;
-	pixel_y = 12
-	},
 /obj/machinery/airalarm/directional/south,
 /obj/item/storage/crayons{
 	pixel_y = -6

diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -11009,11 +11009,6 @@
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/spacemall/dorms)
 "Pj" = (
-/obj/item/clothing/mask/gas/clown_hat{
-	pixel_y = 2;
-	pixel_x = 1;
-	name = "tainted clown wig and mask"
-	},
 /obj/effect/decal/remains/human,
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/wood,

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm
@@ -109,7 +109,6 @@
 /turf/open/floor/noslip,
 /area/overmap_encounter/planetoid/cave/explored)
 "u" = (
-/obj/structure/mecha_wreckage/honker,
 /obj/effect/decal/cleanable/greenglow,
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm
@@ -1507,7 +1507,6 @@
 "nJ" = (
 /obj/structure/rack,
 /obj/item/pneumatic_cannon/pie,
-/obj/item/reagent_containers/spray/waterflower/lube,
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/mineral/bananium,
 /area/ruin/powered)
@@ -3908,9 +3907,6 @@
 	pixel_x = -7;
 	pixel_y = 7
 	},
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat{
-	pixel_y = 5
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
@@ -4342,7 +4338,6 @@
 /area/ruin/powered)
 "Ow" = (
 /obj/structure/table/wood/fancy/orange,
-/obj/item/clothing/under/rank/civilian/clown/rainbow,
 /turf/open/floor/mineral/bananium,
 /area/ruin/powered)
 "Ox" = (

diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -7821,9 +7821,6 @@
 /obj/item/toy/figure/botanist{
 	pixel_x = 2
 	},
-/obj/item/toy/figure/clown{
-	pixel_x = 10
-	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/outpost/maintenance/aft)

diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm
@@ -1186,10 +1186,6 @@
 /area/ship/hallway/fore)
 "hT" = (
 /obj/structure/table/wood,
-/obj/item/clothing/mask/gas/clown_hat,
-/obj/item/bikehorn,
-/obj/item/clothing/shoes/clown_shoes,
-/obj/item/megaphone/clown,
 /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter,
 /obj/item/radio/intercom/directional/south,
 /turf/open/floor/carpet/nanoweave/purple,

diff --git a/code/__DEFINES/cinematics.dm b/code/__DEFINES/cinematics.dm
@@ -9,6 +9,5 @@
 #define CINEMATIC_NUKE_FAKE 9
 #define CINEMATIC_NUKE_NO_CORE 10
 #define CINEMATIC_NUKE_FAR 11
-#define CINEMATIC_NUKE_CLOWNOP 12
-#define CINEMATIC_CULT_NUKE 13
-#define CINEMATIC_CULT_FAIL 14
+#define CINEMATIC_CULT_NUKE 12
+#define CINEMATIC_CULT_FAIL 13
diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm
@@ -265,17 +265,6 @@
 	cinematic_sound(sound('sound/effects/explosion_distant.ogg'))
 	special()
 
-/datum/cinematic/clownop
-	id = CINEMATIC_NUKE_CLOWNOP
-	cleanup_time = 100
-
-/datum/cinematic/clownop/content()
-	flick("intro_nuke",screen)
-	sleep(35)
-	cinematic_sound(sound('sound/items/airhorn.ogg'))
-	flick("summary_selfdes",screen) //???
-	special()
-
 /* Intended usage.
 Nuke.Explosion()
 	-> Cinematic(NUKE_BOOM,world)

diff --git a/code/datums/components/fantasy/suffixes.dm b/code/datums/components/fantasy/suffixes.dm
@@ -128,7 +128,6 @@
 		/obj/projectile/meteor = 1,
 		/obj/projectile/energy/nuclear_particle = 1,
 		/obj/projectile/beam/pulse = 1,
-		/obj/projectile/bullet/honker = 15,
 		/obj/projectile/temp = 15,
 		/obj/projectile/ion = 15,
 		/obj/projectile/magic/door = 15,

diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm
diff --git a/code/game/gamemodes/clown_ops/bananium_bomb.dm b/code/game/gamemodes/clown_ops/bananium_bomb.dm
diff --git a/code/game/gamemodes/clown_ops/clown_ops.dm b/code/game/gamemodes/clown_ops/clown_ops.dm