diff --git a/baystation12.dme b/baystation12.dme index 18396c4adf0..66b5d8e3ec6 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -340,7 +340,6 @@ #include "code\game\machinery\bots\bots.dm" #include "code\game\machinery\bots\cleanbot.dm" #include "code\game\machinery\bots\ed209bot.dm" -#include "code\game\machinery\bots\floorbot.dm" #include "code\game\machinery\bots\medbot.dm" #include "code\game\machinery\bots\mulebot.dm" #include "code\game\machinery\bots\secbot.dm" @@ -778,6 +777,8 @@ #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\events\alien_infestation.dm" #include "code\modules\events\blob.dm" #include "code\modules\events\brand_intelligence.dm" #include "code\modules\events\carp_migration.dm" @@ -968,7 +969,6 @@ #include "code\modules\mob\living\silicon\robot\wires.dm" #include "code\modules\mob\living\simple_animal\constructs.dm" #include "code\modules\mob\living\simple_animal\corpse.dm" -#include "code\modules\mob\living\simple_animal\kobold.dm" #include "code\modules\mob\living\simple_animal\parrot.dm" #include "code\modules\mob\living\simple_animal\shade.dm" #include "code\modules\mob\living\simple_animal\simple_animal.dm" @@ -1156,6 +1156,16 @@ #include "code\modules\scripting\Scanner\Tokens.dm" #include "code\modules\security levels\keycard authentication.dm" #include "code\modules\security levels\security levels.dm" +#include "code\modules\surgery\appendix.dm" +#include "code\modules\surgery\bones.dm" +#include "code\modules\surgery\braincore.dm" +#include "code\modules\surgery\eye.dm" +#include "code\modules\surgery\face.dm" +#include "code\modules\surgery\generic.dm" +#include "code\modules\surgery\other.dm" +#include "code\modules\surgery\ribcage.dm" +#include "code\modules\surgery\robolimbs.dm" +#include "code\modules\surgery\surgery.dm" #include "code\WorkInProgress\autopsy.dm" #include "code\WorkInProgress\buildmode.dm" #include "code\WorkInProgress\explosion_particles.dm" @@ -1177,6 +1187,8 @@ #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_temple.dm" #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_tribe.dm" #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_turfs.dm" +#include "code\WorkInProgress\Cael_Aislinn\Jungle\misc_helpers.dm" +#include "code\WorkInProgress\Cael_Aislinn\Rust\areas.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_field.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_gen.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_monitor.dm" diff --git a/code/modules/mob/living/carbon/human/hud_overlays.dm b/code/modules/mob/living/carbon/human/hud_overlays.dm deleted file mode 100644 index 9163a8a6af9..00000000000 --- a/code/modules/mob/living/carbon/human/hud_overlays.dm +++ /dev/null @@ -1,19 +0,0 @@ -mob/var/image/antag_img -mob/living/carbon/human - var/image/med_img - var/image/sec_img - var/image/sec2_img - var/image/imp_img - var/image/health_img - -mob/New() - . = ..() - antag_img = image('icons/mob/hud.dmi',src) - -mob/living/carbon/human/New() - . = ..() - med_img = image('icons/mob/hud.dmi',src) - sec_img = image('icons/mob/hud.dmi',src) - sec2_img = image('icons/mob/hud.dmi',src) - imp_img = image('icons/mob/hud.dmi',src) - health_img = image('icons/mob/hud.dmi',src) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index eec78e9ae68..c518b27a02d 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -34,7 +34,7 @@ for(var/i = 0,i