From ac26403ee88e05547ef52c96c65327e5438bd4ab Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Sat, 3 Jun 2023 11:24:41 -0400 Subject: [PATCH] Kills the change stone (#3507) # About the pull request This PR removes the Changestone # Explain why it's good for the game No LRP. Soul removal. #SS13GetOut. Etc. # 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 the change stone /:cl: --- code/__DEFINES/human.dm | 5 --- code/game/objects/items/artifacts.dm | 34 ------------------- .../mob/living/carbon/human/human_defines.dm | 3 -- colonialmarines.dme | 1 - maps/map_files/BigRed/BigRed.dmm | 1 - .../BigRed/sprinkles/25.chapel_cult.dmm | 1 - 6 files changed, 45 deletions(-) delete mode 100644 code/game/objects/items/artifacts.dm diff --git a/code/__DEFINES/human.dm b/code/__DEFINES/human.dm index 6e2d82d5cc4f..846119d6b55d 100644 --- a/code/__DEFINES/human.dm +++ b/code/__DEFINES/human.dm @@ -213,8 +213,3 @@ #define RELIGION_AGNOSTICISM "Agnostic" #define MAXIMUM_DROPPED_OBJECTS_REMEMBERED 2 - -///////////////////MISC HUMAN FLAGS (LINKED TO VAR: FLAGS_HUMAN_MISC)/////////////////// - -#define HUMAN_FLAG_CHANGED (1<<0) - diff --git a/code/game/objects/items/artifacts.dm b/code/game/objects/items/artifacts.dm deleted file mode 100644 index a5845eaf4a97..000000000000 --- a/code/game/objects/items/artifacts.dm +++ /dev/null @@ -1,34 +0,0 @@ -/obj/item/changestone - name = "\proper an uncut ruby" - desc = "The ruby shines and catches the light, despite being uncut." - icon = 'icons/obj/items/misc.dmi' - icon_state = "changerock" - -/obj/item/changestone/proc/change(mob/target) - if(!ishuman(target)) - return FALSE - var/mob/living/carbon/human/humantarget = target - if(humantarget.flags_human_misc & HUMAN_FLAG_CHANGED) - return - if(humantarget.gender == FEMALE) - humantarget.gender = MALE - else - humantarget.gender = FEMALE - humantarget.visible_message(SPAN_NOTICE("[humantarget] changes in a way you can't quite pinpoint."), SPAN_NOTICE("You feel different.")) - humantarget.flags_human_misc |= HUMAN_FLAG_CHANGED - return TRUE - -/obj/item/changestone/attack_hand(mob/user as mob) - change(user) - . = ..() - -/obj/item/changestone/attack(mob/living/M, mob/living/user) - if(change(user)) - return - . = ..() - -/obj/item/changestone/mob_launch_collision(mob/living/L) - . = ..() - change(L) - - diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 16d456867f91..7018a8cc8884 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -158,9 +158,6 @@ var/datum/action/human_action/activable/selected_ability - /// misc human flags - var/flags_human_misc = 0 - ///list of weakrefs of recently dropped objects var/list/remembered_dropped_objects = list() diff --git a/colonialmarines.dme b/colonialmarines.dme index 4029b575c5a9..8862b15b95bf 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -949,7 +949,6 @@ #include "code\game\objects\effects\spawners\vaultspawner.dm" #include "code\game\objects\effects\spawners\wo_spawners\players.dm" #include "code\game\objects\effects\spawners\wo_spawners\supplies.dm" -#include "code\game\objects\items\artifacts.dm" #include "code\game\objects\items\ashtray.dm" #include "code\game\objects\items\backpack_sprayers.dm" #include "code\game\objects\items\bodybag.dm" diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index bd8669081641..48a22ed12f1a 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -15657,7 +15657,6 @@ /area/bigredv2/outside/admin_building) "aRf" = ( /obj/structure/surface/table, -/obj/item/changestone, /turf/open/floor{ icon_state = "wood" }, diff --git a/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm b/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm index 1f5792284797..7acf197b3ddb 100644 --- a/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm +++ b/maps/map_files/BigRed/sprinkles/25.chapel_cult.dmm @@ -52,7 +52,6 @@ }, /area/bigredv2/outside/chapel) "aj" = ( -/obj/item/changestone, /turf/open/floor{ icon_state = "darkish" },