From 23fcb67e806642d0567b6d8b487189c7085396a2 Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Tue, 12 Sep 2023 06:47:22 -0400 Subject: [PATCH] Removes some mapped clown gear (#4388) # About the pull request God I hate clowns # Explain why it's good for the game # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: Morrow del: Removed some mapped clown gear /:cl: --- .../effects/landmarks/corpsespawner.dm | 4 --- code/modules/gear_presets/corpses.dm | 27 ------------------- .../FOP_v3_Sciannex/Fiorina_SciAnnex.dmm | 4 --- maps/map_files/Kutjevo/Kutjevo.dmm | 9 +------ maps/map_files/New_Varadero/New_Varadero.dmm | 1 - .../Sorokyne_Strata/Sorokyne_Strata.dmm | 9 +------ 6 files changed, 2 insertions(+), 52 deletions(-) diff --git a/code/game/objects/effects/landmarks/corpsespawner.dm b/code/game/objects/effects/landmarks/corpsespawner.dm index bcedcb85f47e..fe338bceabfe 100644 --- a/code/game/objects/effects/landmarks/corpsespawner.dm +++ b/code/game/objects/effects/landmarks/corpsespawner.dm @@ -48,10 +48,6 @@ name = "Engineer" equip_path = /datum/equipment_preset/corpse/engineer -/obj/effect/landmark/corpsespawner/clown - name = "Clown" - equip_path = /datum/equipment_preset/corpse/clown - /obj/effect/landmark/corpsespawner/scientist name = "Scientist" equip_path = /datum/equipment_preset/corpse/scientist diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index 62782b77eae5..f0ad6f85a8b4 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -213,33 +213,6 @@ //*****************************************************************************************************/ -/datum/equipment_preset/corpse/clown - name = "Corpse - Clown" - assignment = "Clown" - uses_special_name = TRUE - -/datum/equipment_preset/corpse/clown/New() - . = ..() - //As a joke, clown has all access so they can clown everywhere... - access = get_access(ACCESS_LIST_DELIVERY) - -/datum/equipment_preset/corpse/clown/load_name(mob/living/carbon/human/new_human, randomise) - . = ..() //To load gender, randomise appearance, etc. - new_human.change_real_name(new_human, pick(clown_names)) //Picking a proper clown name! - -/datum/equipment_preset/corpse/clown/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/clown(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/toy/bikehorn(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/clown(new_human), WEAR_BACK) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - else - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - -//*****************************************************************************************************/ - /datum/equipment_preset/corpse/scientist name = "Corpse - Scientist" assignment = "Scientist" diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 9d8033ae0ae8..e8c3bb319b7e 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -12808,9 +12808,7 @@ /area/fiorina/lz/near_lzII) "hTr" = ( /obj/structure/closet, -/obj/item/clothing/mask/gas/clown_hat, /obj/effect/spawner/random/gun/shotgun/midchance, -/obj/item/clothing/under/marine/ucf_clown, /turf/open/floor/plating/prison, /area/fiorina/maintenance) "hTs" = ( @@ -25559,8 +25557,6 @@ /area/fiorina/tumor/aux_engi) "pON" = ( /obj/structure/closet, -/obj/item/storage/backpack/clown, -/obj/item/toy/bikehorn, /turf/open/floor/prison{ dir = 4; icon_state = "bluecorner" diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index 646ed4dcbc8c..fed056caf3d4 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -16657,13 +16657,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/kutjevo/colors/red/tile, /area/kutjevo/interior/oob/dev_room) -"wSN" = ( -/obj/structure/blocker/invisible_wall, -/obj/effect/landmark/corpsespawner/clown, -/turf/open/desert/desert_shore/desert_shore1{ - dir = 1 - }, -/area/kutjevo/interior/oob/dev_room) "wSU" = ( /obj/structure/machinery/light{ dir = 4 @@ -20023,7 +20016,7 @@ rkt jBJ fOU ibm -wSN +rYs fAF fQB uam diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index d315d9bfd84b..ae2d59345596 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -29173,7 +29173,6 @@ /area/varadero/interior/cargo) "sCK" = ( /obj/structure/closet/secure_closet/scientist, -/obj/item/clothing/mask/gas/clown_hat, /turf/open/floor/shiva{ dir = 8; icon_state = "purple" diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index ff1d99eb8f78..edc1340df385 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -402,13 +402,6 @@ /obj/effect/blocker/sorokyne_cold_water, /turf/open/gm/river, /area/strata/ag/exterior/paths/cabin_area) -"abx" = ( -/obj/effect/landmark/corpsespawner/clown, -/turf/open/floor/strata{ - dir = 10; - icon_state = "multi_tiles" - }, -/area/strata/ag/interior/outpost/gen/bball/nest) "aby" = ( /obj/structure/machinery/camera/autoname{ dir = 8 @@ -61048,7 +61041,7 @@ aac aac rKG bsS -abx +cjq bvt rKG aac