Switch to using modular chomp folder

This commit is contained in:
TheGreatKitsune
2022-08-21 10:23:30 -05:00
parent d41e1e902c
commit a4ecc0b74d
9 changed files with 18 additions and 18 deletions

View File

@@ -10,4 +10,4 @@
#define MAT_CARPET_SILVERBLUE "silver blue carpet" #define MAT_CARPET_SILVERBLUE "silver blue carpet"
#define MAT_CARPET_PINK "pink carpet" #define MAT_CARPET_PINK "pink carpet"
#define MAT_CARPET_PURPLE "purple carpet" #define MAT_CARPET_PURPLE "purple carpet"
#define MAT_CARPET_ORANGE "orange carpet" #define MAT_CARPET_ORANGE "orange carpet"

View File

@@ -1,6 +0,0 @@
/datum/preferences
var/digitigrade = 0 // 0 = no digi, 1 = default, 2+ = digi styles... (Not used yet)
var/job_other_low = 0
var/job_other_med = 0
var/job_other_high = 0

View File

@@ -7,4 +7,4 @@
var/obj/item/weapon/spacecash/ewallet/wallet = H.r_store var/obj/item/weapon/spacecash/ewallet/wallet = H.r_store
if(istype(wallet)) if(istype(wallet))
wallet.owner_name = H.real_name wallet.owner_name = H.real_name
wallet.worth = 1000 wallet.worth = 1000

View File

@@ -3,4 +3,4 @@
short_name = "N/A" short_name = "N/A"
sorting_order = -99 sorting_order = -99
visible = FALSE visible = FALSE
assignable = FALSE assignable = FALSE

View File

@@ -18,4 +18,4 @@
/datum/job/noncrew/is_species_banned(species_name, brain_type) /datum/job/noncrew/is_species_banned(species_name, brain_type)
// Any species can join as non-crew, including shadekin. // Any species can join as non-crew, including shadekin.
return FALSE return FALSE

View File

@@ -3,4 +3,4 @@ var/list/shell_module_blacklist = list(
"Sci-borg", "Research" "Sci-borg", "Research"
) )
var/list/latejoin_gatewaystation = list() var/list/latejoin_gatewaystation = list()
var/list/latejoin_plainspath = list() var/list/latejoin_plainspath = list()

View File

@@ -1,3 +1,10 @@
/datum/preferences
var/digitigrade = 0 // 0 = no digi, 1 = default, 2+ = digi styles... (Not used yet)
var/job_other_low = 0
var/job_other_med = 0
var/job_other_high = 0
/client/verb/toggle_random_emote_pitch() /client/verb/toggle_random_emote_pitch()
set name = "Toggle Random Emote Pitch" set name = "Toggle Random Emote Pitch"
set category = "Preferences" set category = "Preferences"

View File

@@ -26,4 +26,4 @@
/datum/spawnpoint/plainspath/New() /datum/spawnpoint/plainspath/New()
..() ..()
turfs = latejoin_plainspath turfs = latejoin_plainspath

View File

@@ -16,7 +16,6 @@
#include "code\_map_tests.dm" #include "code\_map_tests.dm"
#include "code\_unit_tests.dm" #include "code\_unit_tests.dm"
#include "code\global.dm" #include "code\global.dm"
#include "code\global_ch.dm"
#include "code\global_init.dm" #include "code\global_init.dm"
#include "code\global_vr.dm" #include "code\global_vr.dm"
#include "code\global_yw.dm" #include "code\global_yw.dm"
@@ -446,7 +445,6 @@
#include "code\datums\outfits\jobs\medical.dm" #include "code\datums\outfits\jobs\medical.dm"
#include "code\datums\outfits\jobs\medical_vr.dm" #include "code\datums\outfits\jobs\medical_vr.dm"
#include "code\datums\outfits\jobs\misc.dm" #include "code\datums\outfits\jobs\misc.dm"
#include "code\datums\outfits\jobs\noncrew_ch.dm"
#include "code\datums\outfits\jobs\science.dm" #include "code\datums\outfits\jobs\science.dm"
#include "code\datums\outfits\jobs\science_vr.dm" #include "code\datums\outfits\jobs\science_vr.dm"
#include "code\datums\outfits\jobs\security.dm" #include "code\datums\outfits\jobs\security.dm"
@@ -816,7 +814,6 @@
#include "code\game\jobs\job\civilian_chaplain.dm" #include "code\game\jobs\job\civilian_chaplain.dm"
#include "code\game\jobs\job\civilian_vr.dm" #include "code\game\jobs\job\civilian_vr.dm"
#include "code\game\jobs\job\department.dm" #include "code\game\jobs\job\department.dm"
#include "code\game\jobs\job\department_ch.dm"
#include "code\game\jobs\job\department_vr.dm" #include "code\game\jobs\job\department_vr.dm"
#include "code\game\jobs\job\engineering.dm" #include "code\game\jobs\job\engineering.dm"
#include "code\game\jobs\job\engineering_vr.dm" #include "code\game\jobs\job\engineering_vr.dm"
@@ -826,7 +823,6 @@
#include "code\game\jobs\job\medical.dm" #include "code\game\jobs\job\medical.dm"
#include "code\game\jobs\job\medical_ch.dm" #include "code\game\jobs\job\medical_ch.dm"
#include "code\game\jobs\job\medical_vr.dm" #include "code\game\jobs\job\medical_vr.dm"
#include "code\game\jobs\job\noncrew_ch.dm"
#include "code\game\jobs\job\offduty_vr.dm" #include "code\game\jobs\job\offduty_vr.dm"
#include "code\game\jobs\job\science.dm" #include "code\game\jobs\job\science.dm"
#include "code\game\jobs\job\science_vr.dm" #include "code\game\jobs\job\science_vr.dm"
@@ -1979,11 +1975,9 @@
#include "code\modules\client\client procs_vr.dm" #include "code\modules\client\client procs_vr.dm"
#include "code\modules\client\movement.dm" #include "code\modules\client\movement.dm"
#include "code\modules\client\preferences.dm" #include "code\modules\client\preferences.dm"
#include "code\modules\client\preferences_ch.dm"
#include "code\modules\client\preferences_factions.dm" #include "code\modules\client\preferences_factions.dm"
#include "code\modules\client\preferences_savefile.dm" #include "code\modules\client\preferences_savefile.dm"
#include "code\modules\client\preferences_spawnpoints.dm" #include "code\modules\client\preferences_spawnpoints.dm"
#include "code\modules\client\preferences_spawnpoints_ch.dm"
#include "code\modules\client\preferences_toggle_procs.dm" #include "code\modules\client\preferences_toggle_procs.dm"
#include "code\modules\client\preferences_vr.dm" #include "code\modules\client\preferences_vr.dm"
#include "code\modules\client\preferences_yw.dm" #include "code\modules\client\preferences_yw.dm"
@@ -4488,12 +4482,17 @@
#include "maps\submaps\surface_submaps\wilderness\wilderness.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness.dm"
#include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
#include "maps\~map_system\maps.dm" #include "maps\~map_system\maps.dm"
#include "modular_chomp\code\global.dm"
#include "modular_chomp\code\datums\autolathe\arms.dm" #include "modular_chomp\code\datums\autolathe\arms.dm"
#include "modular_chomp\code\datums\autolathe\engineering_ch.dm" #include "modular_chomp\code\datums\autolathe\engineering_ch.dm"
#include "modular_chomp\code\datums\autolathe\general_ch.dm" #include "modular_chomp\code\datums\autolathe\general_ch.dm"
#include "modular_chomp\code\datums\outfits\jobs\noncrew.dm"
#include "modular_chomp\code\game\jobs\job\department.dm"
#include "modular_chomp\code\game\jobs\job\noncrew.dm"
#include "modular_chomp\code\game\machinery\airconditioner_ch.dm" #include "modular_chomp\code\game\machinery\airconditioner_ch.dm"
#include "modular_chomp\code\modules\admin\functions\modify_traits.dm" #include "modular_chomp\code\modules\admin\functions\modify_traits.dm"
#include "modular_chomp\code\modules\client\preferences.dm" #include "modular_chomp\code\modules\client\preferences.dm"
#include "modular_chomp\code\modules\client\preferences_spawnpoints.dm"
#include "modular_chomp\code\modules\client\preference_setup\global\setting_datums.dm" #include "modular_chomp\code\modules\client\preference_setup\global\setting_datums.dm"
#include "modular_chomp\code\modules\clothing\face\gasmask.dm" #include "modular_chomp\code\modules\clothing\face\gasmask.dm"
#include "modular_chomp\code\modules\clothing\face\miscellaneous.dm" #include "modular_chomp\code\modules\clothing\face\miscellaneous.dm"