diff --git a/sandcode/code/modules/client/loadout/_defines.dm b/sandcode/code/modules/client/loadout/_defines.dm deleted file mode 100644 index aa11ca6479..0000000000 --- a/sandcode/code/modules/client/loadout/_defines.dm +++ /dev/null @@ -1,37 +0,0 @@ -// Everyone, but Civilian and Service -#define NOCIV_ROLES list(\ - "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster",\ - "Medical Doctor", "Chemist", "Paramedic", "Virologist", "Geneticist", "Scientist", "Roboticist",\ - "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Blueshield", "Brig Physician",\ - "Cargo Technician", "Shaft Miner"\ - ) - -// Literally everyone, but Prisoners. Hopefully tempoary, until proper blacklist. -#define NOPRISON_ROLES list(\ - "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster",\ - "Medical Doctor", "Chemist", "Paramedic", "Virologist", "Geneticist", "Scientist", "Roboticist",\ - "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Blueshield", "Brig Physician",\ - "Cargo Technician", "Shaft Miner", "Bartender", "Botanist", "Cook", "Curator", "Chaplain", "Janitor",\ - "Clown", "Mime", "Lawyer", "Assistant"\ - ) - -// Some of these might be left unused, but still it's nice to have them around. -#define CMD_ROLES list("Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster") -#define MED_ROLES list("Chief Medical Officer", "Medical Doctor", "Virologist", "Chemist", "Geneticist", "Paramedic", "Brig Physician") -#define SCI_ROLES list("Research Director", "Scientist", "Roboticist") -#define SEC_ROLES list("Head of Security", "Security Officer", "Warden", "Brig Physician", "Blueshield") -#define ENG_ROLES list("Chief Engineer", "Atmospheric Technician", "Station Engineer") -#define CRG_ROLES list("Quartermaster", "Cargo Technician", "Shaft Miner") -#define CIV_ROLES list("Head of Personnel", "Bartender", "Botanist", "Cook", "Curator", "Chaplain", "Janitor", "Clown", "Mime", "Lawyer", "Assistant") -#define FUN_ROLES list("Clown", "Mime") - -// Hybrids. Might be left unused even more, aside from OrviTrek-like stuff. As for OPRS it is ENG+SEC+CRG. -#define MEDSCI_ROLES list(\ - "Chief Medical Officer", "Medical Doctor", "Virologist", "Chemist", "Geneticist", "Paramedic",\ - "Research Director", "Scientist", "Roboticist"\ - ) -#define OPRS_ROLES list(\ - "Head of Security", "Security Officer", "Warden", "Brig Physician", "Blueshield",\ - "Chief Engineer", "Atmospheric Technician", "Station Engineer",\ - "Quartermaster", "Cargo Technician", "Shaft Miner"\ - ) diff --git a/sandcode/code/modules/client/loadout/~defines.dm b/sandcode/code/modules/client/loadout/~defines.dm deleted file mode 100644 index 6bf532503b..0000000000 --- a/sandcode/code/modules/client/loadout/~defines.dm +++ /dev/null @@ -1,15 +0,0 @@ -// Simply undefines loadout stuff to not mess with the rest of code, and because BYOND is BYOND. -#undef NOCIV_ROLES -#undef NOPRISON_ROLES - -#undef CMD_ROLES -#undef MED_ROLES -#undef SCI_ROLES -#undef SEC_ROLES -#undef ENG_ROLES -#undef CRG_ROLES -#undef CIV_ROLES -#undef FUN_ROLES - -#undef MEDSCI_ROLES -#undef OPRS_ROLES diff --git a/sandcode/code/modules/custom_loadout/custom_items.dm b/sandcode/code/modules/custom_loadout/custom_items.dm deleted file mode 100644 index 6e845700b9..0000000000 --- a/sandcode/code/modules/custom_loadout/custom_items.dm +++ /dev/null @@ -1,7 +0,0 @@ -//Gift for Judas2Priest -/obj/item/toy/plush/eevee - name = "Eevee" - desc = "You might have seen this fluffy creature somewhere sometime ago but you can't guite but your finger on it" - icon = 'sandcode/icons/obj/plushies.dmi' - icon_state = "eevee" - item_state = "eevee" diff --git a/sandcode/icons/obj/plushies.dmi b/sandcode/icons/obj/plushies.dmi index 12495f0830..19e029c9b0 100644 Binary files a/sandcode/icons/obj/plushies.dmi and b/sandcode/icons/obj/plushies.dmi differ diff --git a/tgstation.dme b/tgstation.dme index cacf3a9f44..a1827c02d3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3600,8 +3600,6 @@ #include "sandcode\code\modules\cargo\packs\emergency.dm" #include "sandcode\code\modules\client\asset_cache.dm" #include "sandcode\code\modules\client\loadout\__donator.dm" -#include "sandcode\code\modules\client\loadout\_defines.dm" -#include "sandcode\code\modules\client\loadout\~defines.dm" #include "sandcode\code\modules\clothing\refactor.dm" #include "sandcode\code\modules\clothing\head\misc.dm" #include "sandcode\code\modules\clothing\masks\miscellaneous.dm" @@ -3609,7 +3607,6 @@ #include "sandcode\code\modules\clothing\spacesuits\chronosuit.dm" #include "sandcode\code\modules\clothing\spacesuits\hardsuit.dm" #include "sandcode\code\modules\crafting\recipes\recipes_misc.dm" -#include "sandcode\code\modules\custom_loadout\custom_items.dm" #include "sandcode\code\modules\hydroponics\grown\misc.dm" #include "sandcode\code\modules\integrated_electronics\subtypes\output.dm" #include "sandcode\code\modules\keybindings\keybind\carbon.dm"