diff --git a/baystation12.dme b/baystation12.dme index 113bcecab76..77d15883808 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -5,6 +5,71 @@ // END_INTERNALS // BEGIN_FILE_DIR #define FILE_DIR . +#define FILE_DIR "code" +#define FILE_DIR "code/TriDimension" +#define FILE_DIR "code/unused" +#define FILE_DIR "code/unused/goonheist" +#define FILE_DIR "code/WorkInProgress" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jungle" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/ShieldGen" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" +#define FILE_DIR "code/WorkInProgress/Susan" +#define FILE_DIR "html" +#define FILE_DIR "icons" +#define FILE_DIR "icons/48x48" +#define FILE_DIR "icons/ass" +#define FILE_DIR "icons/effects" +#define FILE_DIR "icons/mecha" +#define FILE_DIR "icons/misc" +#define FILE_DIR "icons/mob" +#define FILE_DIR "icons/mob/human_races" +#define FILE_DIR "icons/mob/otherHuman" +#define FILE_DIR "icons/mob/species" +#define FILE_DIR "icons/mob/species/vox" +#define FILE_DIR "icons/mob/species/vox/armalis" +#define FILE_DIR "icons/mob/spirits" +#define FILE_DIR "icons/NTOS" +#define FILE_DIR "icons/obj" +#define FILE_DIR "icons/obj/assemblies" +#define FILE_DIR "icons/obj/atmospherics" +#define FILE_DIR "icons/obj/clothing" +#define FILE_DIR "icons/obj/doors" +#define FILE_DIR "icons/obj/flora" +#define FILE_DIR "icons/obj/machines" +#define FILE_DIR "icons/obj/pipes" +#define FILE_DIR "icons/obj/power_cond" +#define FILE_DIR "icons/pda_icons" +#define FILE_DIR "icons/pods" +#define FILE_DIR "icons/spideros_icons" +#define FILE_DIR "icons/stamp_icons" +#define FILE_DIR "icons/Testing" +#define FILE_DIR "icons/turf" +#define FILE_DIR "icons/vending_icons" +#define FILE_DIR "nano" +#define FILE_DIR "nano/images" +#define FILE_DIR "sound" +#define FILE_DIR "sound/AI" +#define FILE_DIR "sound/ambience" +#define FILE_DIR "sound/effects" +#define FILE_DIR "sound/effects/turret" +#define FILE_DIR "sound/effects/wind" +#define FILE_DIR "sound/hallucinations" +#define FILE_DIR "sound/items" +#define FILE_DIR "sound/machines" +#define FILE_DIR "sound/mecha" +#define FILE_DIR "sound/misc" +#define FILE_DIR "sound/music" +#define FILE_DIR "sound/piano" +#define FILE_DIR "sound/turntable" +#define FILE_DIR "sound/violin" +#define FILE_DIR "sound/voice" +#define FILE_DIR "sound/voice/complionator" +#define FILE_DIR "sound/voice/Serithi" +#define FILE_DIR "sound/vox" +#define FILE_DIR "sound/vox_fem" +#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES #define DEBUG @@ -883,10 +948,10 @@ #include "code\modules\customitems\item_spawning.dm" #include "code\modules\customitems\definitions\base.dm" #include "code\modules\destilery\main.dm" -#include "code\modules\detectivework\detective_work.dm" -#include "code\modules\detectivework\evidence.dm" -#include "code\modules\detectivework\footprints_and_rag.dm" -#include "code\modules\detectivework\scanner.dm" +#include "code\modules\DetectiveWork\detective_work.dm" +#include "code\modules\DetectiveWork\evidence.dm" +#include "code\modules\DetectiveWork\footprints_and_rag.dm" +#include "code\modules\DetectiveWork\scanner.dm" #include "code\modules\economy\Accounts.dm" #include "code\modules\economy\Accounts_DB.dm" #include "code\modules\economy\ATM.dm" diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index d9f44d9315a..6a6a30e7420 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -194,6 +194,35 @@ //Vox Armalis gear. +//Vox Armalis gear. +/obj/item/clothing/shoes/magboots/vox/armalis + name = "large vox magclaws" + item_state = "boots-armalis" + icon_state = "boots-armalis" + icon_override = 'icons/mob/species/vox/armalis/shoes.dmi' + species_restricted = list("Vox Armalis") + +/obj/item/clothing/gloves/yellow/vox/armalis + name = "large insulated gauntlets" + item_state = "gloves-armalis" + icon_state = "gloves-armalis" + icon_override = 'icons/mob/species/vox/armalis/hands.dmi' + species_restricted = list("Vox Armalis") + +/obj/item/clothing/mask/breath/vox/armalis + name = "large vox mask" + item_state = "mask-armalis" + icon_state = "mask-armalis" + icon_override = 'icons/mob/species/vox/armalis/mask.dmi' + species_restricted = list("Vox Armalis") + +/obj/item/clothing/suit/space/vox/carapace/armalis + name = "large alien carapace armour" + item_state = "armour-armalis" + icon_state = "armour-armalis" + icon_override = 'icons/mob/vox.dmi' + species_restricted = list("Vox Armalis") + /obj/item/clothing/suit/space/vox/carapace/armalis name = "large alien carapace armour" item_state = "armour-armalis" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index cd3c6a7d5de..cef07c0f7f8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1496,8 +1496,8 @@ G.synch() /mob/living/carbon/human/proc/gut() - set category = "IC" - set name = "Abilities" + set category = "Abilities" + set name = "Gut" set desc = "While grabbing someone aggressively, rip their guts out or tear them apart." if(last_special > world.time) diff --git a/code/stylesheet.dm b/code/stylesheet.dm index c0d35351634..ffdc718eba8 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -59,7 +59,7 @@ h1.alert, h2.alert {color: #000000;} .mod {color: #735638; font-weight: bold;} .modooc {color: #184880; font-weight: bold;} -.adminchat {color: #9000FF; font-weight: bold;} +.adminchat {color: #9A04D1; font-weight: bold;} .adminmod {color: #402A14; font-weight: bold;} .alien {color: #543354;} diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 1b12b5582a3..a324b84830a 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index a24c8d8dd17..d7b7822cd22 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index bde50e910c3..de135fa0d5f 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/species/vox/armalis/hands.dmi b/icons/mob/species/vox/armalis/hands.dmi index 7d3eed317af..d434df174f3 100644 Binary files a/icons/mob/species/vox/armalis/hands.dmi and b/icons/mob/species/vox/armalis/hands.dmi differ diff --git a/icons/mob/species/vox/armalis/mask.dmi b/icons/mob/species/vox/armalis/mask.dmi index 7670dcfade4..3876982bf65 100644 Binary files a/icons/mob/species/vox/armalis/mask.dmi and b/icons/mob/species/vox/armalis/mask.dmi differ diff --git a/icons/mob/species/vox/armalis/shoes.dmi b/icons/mob/species/vox/armalis/shoes.dmi index cbd83be7027..67d347a31b3 100644 Binary files a/icons/mob/species/vox/armalis/shoes.dmi and b/icons/mob/species/vox/armalis/shoes.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index e5025734c2f..6cf3b2fe30c 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index fb4b2aa82ca..9b0972e58bd 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ