Re-Ports Hestia to Bay12 | Vesta Code Bungle

* #VESTA.BAY# FULL PORT Some small polishes are comming. Todo: Add the neural lace backup into the rejuvenate admin verb. Add 4 custom cultures. And thats pretty much it. * Adds r4iser-PR-3 changelogs # Conflicts: # baystation12.dme # code/__defines/chemistry.dm # code/__defines/culture.dm # code/__defines/guns.dm # code/__defines/mobs.dm # code/_helpers/cmp.dm # code/_helpers/global_access.dm # code/controllers/communications.dm # code/controllers/configuration.dm # code/game/dna/dna2.dm # code/game/gamemodes/changeling/changeling_powers.dm # code/modules/client/preference_setup/general/02_body.dm # code/modules/mob/living/carbon/brain/brain.dm # code/modules/mob/living/carbon/human/death.dm # code/modules/mob/living/carbon/human/examine.dm # code/modules/mob/living/carbon/human/human.dm # code/modules/mob/living/carbon/human/update_icons.dm # code/modules/mob/new_player/login.dm # code/modules/organs/external/_external_icons.dm # code/modules/organs/external/head.dm # code/modules/reagents/Chemistry-Reagents.dm # code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm # code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm # code/modules/reagents/Chemistry-Recipes.dm # code/modules/species/station/station.dm # code/modules/surgery/organs_internal.dm # config/example/config.txt # html/changelogs/.all_changelog.yml # icons/mob/onmob/items/lefthand_guns.dmi # icons/mob/onmob/items/righthand_guns.dmi # icons/mob/onmob/onmob_rig_back.dmi # maps/away/skrellscoutship/skrellscoutship_revamp.dmm # maps/torch/icons/assignment_hud.dmi # maps/torch/icons/obj/obj_head_solgov.dmi # maps/torch/icons/obj/obj_suit_solgov.dmi # maps/torch/job/torch_jobs.dm # maps/torch/loadout/_defines.dm # maps/torch/torch2_deck4.dmm # maps/torch/torch3_deck3.dmm # scripts/install-spaceman-dmm.sh # test/check-paths.sh # test/run-test.sh
BoHBranch · Jan 10, 2024 · f26c9b3 · f26c9b3
1 parent d73a026
commit f26c9b3
Show file tree

Hide file tree

Showing 227 changed files with 14,238 additions and 68 deletions.
diff --git a/baystation12.dme b/baystation12.dme
@@ -3322,5 +3322,77 @@
 #include "interface\skin.dmf"
 #include "maps\_map_include.dm"
 #include "maps\_maps.dm"
+#include "modular_boh\code\game\dna\dna_modifier.dm"
+#include "modular_boh\code\game\machinery\cloning.dm"
+#include "modular_boh\code\game\machinery\resleever.dm"
+#include "modular_boh\code\items\documents.dm"
+#include "modular_boh\code\items\medical.dm"
+#include "modular_boh\code\items\storage.dm"
+#include "modular_boh\code\items\clothing\boh_accessory.dm"
+#include "modular_boh\code\items\clothing\boh_clothing.dm"
+#include "modular_boh\code\items\psyker\agent_items.dm"
+#include "modular_boh\code\modules\boxes.dm"
+#include "modular_boh\code\modules\chemicals.dm"
+#include "modular_boh\code\modules\firearms.dm"
+#include "modular_boh\code\modules\material.dm"
+#include "modular_boh\code\modules\circuitboards\circuitboards.dm"
+#include "modular_boh\code\modules\datums\access.dm"
+#include "modular_boh\code\modules\designs\designs_arms_ammo.dm"
+#include "modular_boh\code\modules\modular_computer\cloning.dm"
+#include "modular_boh\code\modules\nullglass\nullglass_misc.dm"
+#include "modular_boh\code\modules\organs\internal\stack.dm"
+#include "modular_boh\code\modules\projectiles\boxes.dm"
+#include "modular_boh\code\modules\projectiles\bullets.dm"
+#include "modular_boh\code\modules\projectiles\ammunition\bullets.dm"
+#include "modular_boh\code\modules\projectiles\beam\beams.dm"
+#include "modular_boh\code\modules\projectiles\projectiles\bullets.dm"
+#include "modular_boh\code\modules\reagents\bottle.dm"
+#include "modular_boh\code\modules\reagents\Chemistry-Reagents-Medicine.dm"
+#include "modular_boh\code\modules\reagents\hypospray.dm"
+#include "modular_boh\code\modules\species\plasmasans_item\plasmasans.dm"
+#include "modular_boh\code\modules\species\plasmasans_mob\plasmasans.dm"
+#include "modular_boh\code\modules\species\plasmasans_organs\plasmasans.dm"
+#include "modular_boh\code\modules\species\shell\shell.dm"
+#include "modular_boh\code\modules\telecomms\encryptionkey.dm"
+#include "modular_boh\code\modules\telecomms\headset.dm"
+#include "modular_boh\code\modules\telecomms\preset.dm"
+#include "modular_mithra\code\__defines\misc.dm"
+#include "modular_mithra\code\__defines\species.dm"
+#include "modular_mithra\code\_onclick\click.dm"
+#include "modular_mithra\code\datums\mutable_appearance.dm"
+#include "modular_mithra\code\game\datum\extensions\multitool\machinery\cloning.dm"
+#include "modular_mithra\code\game\machinery\cryopod.dm"
+#include "modular_mithra\code\game\machinery\sleeper.dm"
+#include "modular_mithra\code\game\machinery\suit_storage_unit.dm"
+#include "modular_mithra\code\modules\clothing\spacesuits\rig\suits\station.dm"
+#include "modular_mithra\code\modules\clothing\spacesuits\void\void.dm"
+#include "modular_mithra\code\modules\culture_descriptor\cultures.dm"
+#include "modular_mithra\code\modules\mithra\01_ears.dm"
+#include "modular_mithra\code\modules\mithra\07_traits.dm"
+#include "modular_mithra\code\modules\mithra\body_markings.dm"
+#include "modular_mithra\code\modules\mithra\global_lists_vr.dm"
+#include "modular_mithra\code\modules\mithra\preferences_vr.dm"
+#include "modular_mithra\code\modules\mithra\spawncheck.dm"
+#include "modular_mithra\code\modules\mithra\sprite_accessories_vr.dm"
+#include "modular_mithra\code\modules\mithra\traits.dm"
+#include "modular_mithra\code\modules\mithra\traits_neutral.dm"
+#include "modular_mithra\code\modules\mithra\update_icons_vr.dm"
+#include "modular_mithra\code\modules\mob\animations.dm"
+#include "modular_mithra\code\modules\mob\inventory.dm"
+#include "modular_mithra\code\modules\organs\robolimbs.dm"
+#include "modular_mithra\code\modules\reagents\reagent_containers\glass.dm"
+#include "modular_mithra\code\modules\research\designs.dm"
+#include "modular_mithra\code\modules\species\station\akula.dm"
+#include "modular_mithra\code\modules\species\station\custom.dm"
+#include "modular_mithra\code\modules\species\station\human2.dm"
+#include "modular_mithra\code\modules\species\station\humanathi.dm"
+#include "modular_mithra\code\modules\species\station\sergal.dm"
+#include "modular_mithra\code\modules\species\station\station.dm"
+#include "modular_mithra\code\modules\species\station\tajaran.dm"
+#include "modular_mithra\code\modules\species\station\vasilissan.dm"
+#include "modular_mithra\code\modules\species\station\vulpkanin.dm"
+#include "modular_mithra\code\modules\sprite_accessories\_accessory_hair.dm"
+#include "modular_mithra\code\modules\sprite_accessories\accessory_humanathi.dm"
+#include "modular_mithra\code\modules\sprite_accessories\accessory_tajara.dm"
 #include "~code\global_init.dm"
 // END_INCLUDE
diff --git a/code/__defines/culture.dm b/code/__defines/culture.dm
@@ -168,6 +168,7 @@
 #define CULTURE_UNATHI_SAVANNAH       "Savannah Clans"
 #define CULTURE_UNATHI_SALT_SWAMP     "Salt Swamp Clans"
 #define CULTURE_UNATHI_SPACE          "Space-Faring Clans"
+#define CULTURE_UNATHI_TERSTEN        "Tersten Clans"
 
 #define HOME_SYSTEM_MOGHES          "Moghes"
 #define HOME_SYSTEM_OUERE           "Ouere"
@@ -179,7 +180,6 @@
 #define FACTION_UNATHI_BAASK             "Ba'ask Krukzuz"
 #define FACTION_UNATHI_GRESIS            "Gresis Krukzuz"
 #define FACTION_UNATHI_RAH_ZAKEH         "Rah'Zakeh League"
-#define FACTION_UNATHI_KHARZA            "Kharza Fleet"
 
 #define RELIGION_UNATHI_STRATAGEM    "Grand Stratagem"
 #define RELIGION_UNATHI_PRECURSOR    "Precursor"
@@ -199,3 +199,51 @@
 #define CULTURE_NABBER_AMINUS "Grade A-"
 #define CULTURE_NABBER_A      "Grade A"
 #define CULTURE_NABBER_APLUS  "Grade A+"
+
+// Ascent culture.
+#define CULTURE_ASCENT           "The Ascent"
+#define HOME_SYSTEM_KHARMAANI    "Core"
+#define FACTION_ASCENT_GYNE      "Ascent Gyne"
+#define FACTION_ASCENT_ALATE     "Ascent Alate"
+#define FACTION_ASCENT_SERPENTID "Ascent Serpentid"
+#define RELIGION_KHARMAANI       "Nest-Lineage Veneration"
+
+
+
+//##############################################################################################################
+//# MITHRA Adds specific customs into global culture defines ### Mithra had trouble locating these out of here #
+//##################################################################### VESTA.BAY ##############################
+
+///## CULTURE MITHRA DEFINES ########################
+
+#define CULTURE_SYMBIOTIC		"Symbiote Host"
+#define CULTURE_UNATHI			"Moghes Hegemony"
+#define CULTURE_SERGAL			"The Sergals"
+
+///## FACTION UNATHI ###########################
+
+#define FACTION_UNATHI_POLAR        "Polar Clans"
+#define FACTION_UNATHI_DESERT       "Desert Clans"
+#define FACTION_UNATHI_SAVANNAH     "Savannah Clans"
+#define FACTION_UNATHI_DIAMOND_PEAK "Diamond Peak Clans"
+#define FACTION_UNATHI_SALT_SWAMP   "Salt Swamp Clans"
+#define FACTION_UNATHI_YEOSA		"Yeosa Clans"
+
+///## FACTION SERGAL ###########################
+
+#define FACTION_SERGAL_SHIGU "Shigu Dukedom"
+#define FACTION_SERGAL_GOLD_RING "Gold ring megalopolis"
+#define FACTION_SERGAL_REONO "Reono lands"
+
+///## RELIGION SERGAL ##########################
+
+#define RELIGION_SERGAL_ANIMISM "northern religions"
+#define RELIGION_SERGAL_GOLD_RING "religion of Gold ring"
+
+///## HOME SYSTEM SERGAL ##########################
+
+#define HOME_SYSTEM_SERGALTAL "Tal"
+
+//##############################################################################################################
+//# MITHRA Adds specific customs into global culture defines ### Mithra had trouble locating these out of here #
+//##################################################################### VESTA.BAY ##############################
diff --git a/code/__defines/dna.dm b/code/__defines/dna.dm
@@ -15,6 +15,16 @@
 #define MUTATION_SKELETON        10
 #define MUTATION_FERAL           11 // Smash objects instead of using them, and unable to use items
 
+//##############################################################################################################
+//# VESTA.BAY -> Ports Clone System ############################################################################
+//######################################################################## VESTA.BAY ###########################
+
+#define MUTATION_NOCLONE        12
+
+//##############################################################################################################
+//# VESTA.BAY -> Ports Clone System ############################################################################
+//######################################################################## VESTA.BAY ###########################
+
 // Other Mutations:
 #define mNobreath      100 // No need to breathe.
 #define mRemote        101 // Remote viewing.

diff --git a/code/__defines/guns.dm b/code/__defines/guns.dm
@@ -36,3 +36,14 @@
 #define SOUNDS_BULLET_METAL  list('sound/effects/projectile_impact/bullet_metal1.ogg', 'sound/effects/projectile_impact/bullet_metal2.ogg', 'sound/effects/projectile_impact/bullet_metal3.ogg')
 #define SOUNDS_LASER_MEAT  list('sound/effects/projectile_impact/energy_meat1.ogg','sound/effects/projectile_impact/energy_meat2.ogg')
 #define SOUNDS_LASER_METAL  list('sound/effects/projectile_impact/energy_metal1.ogg','sound/effects/projectile_impact/energy_metal2.ogg')
+
+//###################################################################################################################
+//# VESTA.BAY BoH custom items port #################################################################################
+//################################################################################ VESTA.BAY ########################
+
+#define CALIBER_SABOT			"sabot"
+#define CALIBER_PISTOL_MAGNUM_LARGE ".454mm"
+
+//###################################################################################################################
+//# VESTA.BAY BoH custom items port #################################################################################
+//################################################################################ VESTA.BAY ########################
diff --git a/code/__defines/items_clothing.dm b/code/__defines/items_clothing.dm
@@ -43,6 +43,17 @@
 #define ACCESSORY_DEFAULT_FLAGS ( ACCESSORY_REMOVABLE )
 
 
+//####################################################################################################################
+//# VESTA.BAY BoH custom content port ################################################################################
+//############################################################################# VESTA.BAY ############################
+
+#define ACCESSORY_SLOT_OVER		"Overwear cover" // For cloaks.
+
+//####################################################################################################################
+//# VESTA.BAY BoH custom content port ################################################################################
+//############################################################################# VESTA.BAY ############################
+
+
 // Bitmasks for the flags_inv variable. These determine when a piece of clothing hides another, i.e. a helmet hiding glasses.
 // WARNING: The following flags apply only to the external suit!
 #define HIDEGLOVES      FLAG(0)
@@ -183,8 +194,8 @@
 #define  FIRESUIT_MAX_PRESSURE 		100 * ONE_ATMOSPHERE   // Firesuis and atmos voidsuits
 #define  RIG_MAX_PRESSURE 			50 * ONE_ATMOSPHERE   // Rigs
 #define  LIGHT_RIG_MAX_PRESSURE 	25 * ONE_ATMOSPHERE   // Rigs
-#define  ENG_VOIDSUIT_MAX_PRESSURE 	50 * ONE_ATMOSPHERE 
-#define  VOIDSUIT_MAX_PRESSURE 		25 * ONE_ATMOSPHERE 
+#define  ENG_VOIDSUIT_MAX_PRESSURE 	50 * ONE_ATMOSPHERE
+#define  VOIDSUIT_MAX_PRESSURE 		25 * ONE_ATMOSPHERE
 #define  SPACE_SUIT_MAX_PRESSURE 	5 * ONE_ATMOSPHERE
 
 // Fire.

diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm
@@ -346,6 +346,7 @@
 #define SPECIES_HUMAN       "Human"
 #define SPECIES_DIONA       "Diona"
 #define SPECIES_VOX         "Vox"
+#define SPECIES_VOX_ARMALIS "Vox Armalis"
 #define SPECIES_IPC         "Machine"
 #define SPECIES_UNATHI      "Unathi"
 #define SPECIES_SKRELL      "Skrell"
@@ -359,12 +360,46 @@
 #define SPECIES_TRITONIAN   "Tritonian"
 #define SPECIES_GRAVWORLDER "Grav-Adapted Human"
 #define SPECIES_MULE        "Mule"
+#define SPECIES_BOOSTER     "Booster"
 #define SPECIES_MONKEY      "Monkey"
 #define SPECIES_NABBER         "giant armoured serpentid"
-
-#define UNRESTRICTED_SPECIES list(SPECIES_HUMAN, SPECIES_DIONA, SPECIES_IPC, SPECIES_UNATHI, SPECIES_YEOSA, SPECIES_SKRELL, SPECIES_TRITONIAN, SPECIES_SPACER, SPECIES_VATGROWN, SPECIES_GRAVWORLDER, SPECIES_MULE)
-#define RESTRICTED_SPECIES   list(SPECIES_VOX, SPECIES_ALIEN, SPECIES_GOLEM)
-#define HUMAN_SPECIES        list(SPECIES_HUMAN, SPECIES_VATGROWN, SPECIES_SPACER, SPECIES_GRAVWORLDER, SPECIES_MULE)
+#define SPECIES_MONARCH_WORKER "Monarch Serpentid Worker"
+#define SPECIES_MONARCH_QUEEN  "Monarch Serpentid Queen"
+#define SPECIES_MANTID_ALATE   "Kharmaan Alate"
+#define SPECIES_MANTID_GYNE    "Kharmaan Gyne"
+
+//##############################################################################################################
+//# MITHRA Adds specific customs into global mobs defines ###### Mithra had trouble locating these out of here #
+//##################################################################### VESTA.BAY ##############################
+
+#define SPECIES_SHELL		"Shell IPC"
+#define SPECIES_AKULA       "Akula"
+#define SPECIES_CUSTOM      "Genemodder"
+#define SPECIES_VULP        "Vulpkanin"
+#define SPECIES_VASS        "Vasilissan"
+#define SPECIES_TAJ         "Tajaran"
+#define SPECIES_OLDUNATHI   "Veteris'Unathi"
+#define SPECIES_HUMAN2      "Custom Human"
+#define SPECIES_SERGAL      "Sergal"
+
+
+//##############################################################################################################
+//# MITHRA Adds specific customs into global mobs defines ###### Mithra had trouble locating these out of here #
+//##################################################################### VESTA.BAY ##############################
+
+//##############################################################################################################
+//# Bastion Of Hestia Custom Specimen ##########################################################################
+//########################################################################## VESTA.BAY #########################
+
+#define SPECIES_PLASMASANS  "Phoron Restructurant Human"
+
+//##############################################################################################################
+//# Bastion Of Hestia Custom Specimen ##########################################################################
+//########################################################################## VESTA.BAY #########################
+
+#define UNRESTRICTED_SPECIES list(SPECIES_HUMAN, SPECIES_DIONA, SPECIES_IPC, SPECIES_UNATHI, SPECIES_SKRELL, SPECIES_TRITONIAN, SPECIES_SPACER, SPECIES_VATGROWN, SPECIES_GRAVWORLDER, SPECIES_BOOSTER, SPECIES_MULE)
+#define RESTRICTED_SPECIES   list(SPECIES_VOX, SPECIES_ALIEN, SPECIES_GOLEM, SPECIES_MANTID_GYNE, SPECIES_MANTID_ALATE, SPECIES_MONARCH_WORKER, SPECIES_MONARCH_QUEEN)
+#define HUMAN_SPECIES        list(SPECIES_HUMAN, SPECIES_VATGROWN, SPECIES_SPACER, SPECIES_GRAVWORLDER, SPECIES_MULE, SPECIES_BOOSTER)
 
 #define SURGERY_CLOSED 0
 #define SURGERY_OPEN 1

diff --git a/code/__defines/species.dm b/code/__defines/species.dm
@@ -21,6 +21,16 @@
 #define SPECIES_NO_ROBOTIC_INTERNAL_ORGANS    FLAG(5)  // Species cannot start with robotic organs or have them attached.
 
 
+//#######################################################################################################################
+//# VESTA.BAY # PORT NEURAL LACES #######################################################################################
+//################################################################################## VESTA.BAY ##########################
+
+#define SPECIES_NO_LACE						 0x20   // This species can't have a neural lace.
+
+//#######################################################################################################################
+//# VESTA.BAY # PORT NEURAL LACES #######################################################################################
+//################################################################################## VESTA.BAY ##########################
+
 // Species appearance flags
 #define SPECIES_APPEARANCE_HAS_SKIN_TONE_NORMAL     FLAG(0)  // Skin tone selectable in chargen for baseline humans (0-220)
 #define SPECIES_APPEARANCE_HAS_SKIN_COLOR           FLAG(1)  // Skin colour selectable in chargen. (RGB)

diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm
@@ -129,6 +129,16 @@ var/global/const/SRV_FREQ = 1349
 var/global/const/SUP_FREQ = 1347
 var/global/const/EXP_FREQ = 1361
 
+//################################################################################################################
+//# VESTA.BAY BoH Custom content ########### Department Channels #################################################
+//############################################################################### VESTA.BAY ######################
+
+var/const/INF_FREQ = 1369
+
+//################################################################################################################
+//# VESTA.BAY BoH Custom content ########### Department Channels #################################################
+//############################################################################### VESTA.BAY ######################
+
 // internal department channels
 var/global/const/MED_I_FREQ = 1485
 var/global/const/SEC_I_FREQ = 1475
@@ -200,8 +210,12 @@ var/global/list/CENT_FREQS = list(ERT_FREQ, DTH_FREQ)
 // Antag channels, i.e. Syndicate
 var/global/list/ANTAG_FREQS = list(SYND_FREQ, RAID_FREQ, V_RAID_FREQ)
 
+//################################################################################################################
+//# VESTA.BAY BoH Custom content ########### Added INF_FREQ to Bay's core ########################################
+//############################################################################### VESTA.BAY ######################
+
 //Department channels, arranged lexically
-var/global/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ, EXP_FREQ, ENT_FREQ, MED_I_FREQ, SEC_I_FREQ)
+var/global/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, INF_FREQ, MED_FREQ, SEC_FREQ, SCI_FREQ, SRV_FREQ, SUP_FREQ, EXP_FREQ, ENT_FREQ, MED_I_FREQ, SEC_I_FREQ)
 
 #define TRANSMISSION_WIRE	0
 #define TRANSMISSION_RADIO	1
@@ -245,6 +259,17 @@ var/global/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, MED_FREQ, SEC_FR
 	if(frequency in DEPT_FREQS)
 		return "deptradio"
 
+//################################################################################################################
+//# VESTA.BAY BoH Custom content ########### Department Channels #################################################
+//############################################################################### VESTA.BAY ######################
+
+	if(frequency == INF_FREQ)
+		return "infradio"
+
+//################################################################################################################
+//# VESTA.BAY BoH Custom content ########### Department Channels #################################################
+//############################################################################### VESTA.BAY ######################
+
 	// Away site channels
 	for (var/channel in AWAY_FREQS_ASSIGNED)
 		if (AWAY_FREQS_ASSIGNED[channel] == frequency)