Merge branch 'NeuroFix' of https://github.com/Thalpy/Citadel-Station-13 into NeuroFix
This commit is contained in:
Fermi
0
code/modules/jobs/job_types/captain.dm
Executable file → Normal file
0
code/modules/jobs/job_types/captain.dm
Executable file → Normal file
File diff suppressed because it is too large
Load Diff
@@ -550,6 +550,11 @@
|
||||
#include "code\game\gamemodes\devil\game_mode.dm"
|
||||
#include "code\game\gamemodes\devil\objectives.dm"
|
||||
#include "code\game\gamemodes\devil\devil agent\devil_agent.dm"
|
||||
#include "code\game\gamemodes\dynamic\dynamic.dm"
|
||||
#include "code\game\gamemodes\dynamic\dynamic_rulesets.dm"
|
||||
#include "code\game\gamemodes\dynamic\dynamic_rulesets_latejoin.dm"
|
||||
#include "code\game\gamemodes\dynamic\dynamic_rulesets_midround.dm"
|
||||
#include "code\game\gamemodes\dynamic\dynamic_rulesets_roundstart.dm"
|
||||
#include "code\game\gamemodes\extended\extended.dm"
|
||||
#include "code\game\gamemodes\meteor\meteor.dm"
|
||||
#include "code\game\gamemodes\meteor\meteors.dm"
|
||||
@@ -1792,17 +1797,39 @@
|
||||
#include "code\modules\jobs\access.dm"
|
||||
#include "code\modules\jobs\job_exp.dm"
|
||||
#include "code\modules\jobs\jobs.dm"
|
||||
#include "code\modules\jobs\job_types\_job.dm"
|
||||
#include "code\modules\jobs\job_types\ai.dm"
|
||||
#include "code\modules\jobs\job_types\assistant.dm"
|
||||
#include "code\modules\jobs\job_types\atmospheric_technician.dm"
|
||||
#include "code\modules\jobs\job_types\bartender.dm"
|
||||
#include "code\modules\jobs\job_types\botanist.dm"
|
||||
#include "code\modules\jobs\job_types\captain.dm"
|
||||
#include "code\modules\jobs\job_types\cargo_service.dm"
|
||||
#include "code\modules\jobs\job_types\civilian.dm"
|
||||
#include "code\modules\jobs\job_types\civilian_chaplain.dm"
|
||||
#include "code\modules\jobs\job_types\engineering.dm"
|
||||
#include "code\modules\jobs\job_types\job.dm"
|
||||
#include "code\modules\jobs\job_types\medical.dm"
|
||||
#include "code\modules\jobs\job_types\science.dm"
|
||||
#include "code\modules\jobs\job_types\security.dm"
|
||||
#include "code\modules\jobs\job_types\silicon.dm"
|
||||
#include "code\modules\jobs\job_types\cargo_technician.dm"
|
||||
#include "code\modules\jobs\job_types\chaplain.dm"
|
||||
#include "code\modules\jobs\job_types\chemist.dm"
|
||||
#include "code\modules\jobs\job_types\chief_engineer.dm"
|
||||
#include "code\modules\jobs\job_types\chief_medical_officer.dm"
|
||||
#include "code\modules\jobs\job_types\clown.dm"
|
||||
#include "code\modules\jobs\job_types\cook.dm"
|
||||
#include "code\modules\jobs\job_types\curator.dm"
|
||||
#include "code\modules\jobs\job_types\cyborg.dm"
|
||||
#include "code\modules\jobs\job_types\detective.dm"
|
||||
#include "code\modules\jobs\job_types\geneticist.dm"
|
||||
#include "code\modules\jobs\job_types\head_of_personnel.dm"
|
||||
#include "code\modules\jobs\job_types\head_of_security.dm"
|
||||
#include "code\modules\jobs\job_types\janitor.dm"
|
||||
#include "code\modules\jobs\job_types\lawyer.dm"
|
||||
#include "code\modules\jobs\job_types\medical_doctor.dm"
|
||||
#include "code\modules\jobs\job_types\mime.dm"
|
||||
#include "code\modules\jobs\job_types\quartermaster.dm"
|
||||
#include "code\modules\jobs\job_types\research_director.dm"
|
||||
#include "code\modules\jobs\job_types\roboticist.dm"
|
||||
#include "code\modules\jobs\job_types\scientist.dm"
|
||||
#include "code\modules\jobs\job_types\security_officer.dm"
|
||||
#include "code\modules\jobs\job_types\shaft_miner.dm"
|
||||
#include "code\modules\jobs\job_types\station_engineer.dm"
|
||||
#include "code\modules\jobs\job_types\virologist.dm"
|
||||
#include "code\modules\jobs\job_types\warden.dm"
|
||||
#include "code\modules\jobs\map_changes\map_changes.dm"
|
||||
#include "code\modules\keybindings\bindings_admin.dm"
|
||||
#include "code\modules\keybindings\bindings_atom.dm"
|
||||
@@ -1913,15 +1940,17 @@
|
||||
#include "code\modules\mob\dead\new_player\poll.dm"
|
||||
#include "code\modules\mob\dead\new_player\preferences_setup.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\_sprite_accessories.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\alienpeople.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\body_markings.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\caps.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\Citadel_Snowflake.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\ears.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\frills.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\hair_face.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\hair_head.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\horns.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\legs.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\moth_wings.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\ipc_synths.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\legs_and_taurs.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\pines.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\snouts.dm"
|
||||
#include "code\modules\mob\dead\new_player\sprite_accessories\socks.dm"
|
||||
@@ -2028,15 +2057,17 @@
|
||||
#include "code\modules\mob\living\carbon\human\species_types\abductors.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\android.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\angel.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\bugmen.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\corporate.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\dullahan.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\felinid.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\flypeople.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\furrypeople.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\golems.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\humans.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\ipc.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\jellypeople.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\lizardpeople.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\mothmen.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\mushpeople.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\plasmamen.dm"
|
||||
#include "code\modules\mob\living\carbon\human\species_types\podpeople.dm"
|
||||
@@ -2290,6 +2321,10 @@
|
||||
#include "code\modules\NTNet\network.dm"
|
||||
#include "code\modules\NTNet\relays.dm"
|
||||
#include "code\modules\NTNet\services\_service.dm"
|
||||
#include "code\modules\oracle_ui\assets.dm"
|
||||
#include "code\modules\oracle_ui\hookup_procs.dm"
|
||||
#include "code\modules\oracle_ui\oracle_ui.dm"
|
||||
#include "code\modules\oracle_ui\themed.dm"
|
||||
#include "code\modules\paperwork\clipboard.dm"
|
||||
#include "code\modules\paperwork\contract.dm"
|
||||
#include "code\modules\paperwork\filingcabinet.dm"
|
||||
@@ -2906,7 +2941,6 @@
|
||||
#include "modular_citadel\code\game\objects\items\boombox.dm"
|
||||
#include "modular_citadel\code\game\objects\items\holy_weapons.dm"
|
||||
#include "modular_citadel\code\game\objects\items\honk.dm"
|
||||
#include "modular_citadel\code\game\objects\items\meat.dm"
|
||||
#include "modular_citadel\code\game\objects\items\stunsword.dm"
|
||||
#include "modular_citadel\code\game\objects\items\vending_items.dm"
|
||||
#include "modular_citadel\code\game\objects\items\circuitboards\machine_circuitboards.dm"
|
||||
@@ -2915,7 +2949,6 @@
|
||||
#include "modular_citadel\code\game\objects\items\devices\radio\headset.dm"
|
||||
#include "modular_citadel\code\game\objects\items\devices\radio\shockcollar.dm"
|
||||
#include "modular_citadel\code\game\objects\items\melee\eutactic_blades.dm"
|
||||
#include "modular_citadel\code\game\objects\items\melee\misc.dm"
|
||||
#include "modular_citadel\code\game\objects\items\robot\robot_upgrades.dm"
|
||||
#include "modular_citadel\code\game\objects\items\storage\firstaid.dm"
|
||||
#include "modular_citadel\code\game\objects\structures\tables_racks.dm"
|
||||
@@ -3003,7 +3036,6 @@
|
||||
#include "modular_citadel\code\modules\mining\mining_ruins.dm"
|
||||
#include "modular_citadel\code\modules\mob\cit_emotes.dm"
|
||||
#include "modular_citadel\code\modules\mob\mob.dm"
|
||||
#include "modular_citadel\code\modules\mob\dead\new_player\sprite_accessories.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\damage_procs.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\living.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\carbon\carbon.dm"
|
||||
@@ -3013,11 +3045,6 @@
|
||||
#include "modular_citadel\code\modules\mob\living\carbon\human\human.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\carbon\human\human_defense.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\carbon\human\human_movement.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\carbon\human\life.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\carbon\human\species.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\carbon\human\species_types\furrypeople.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\carbon\human\species_types\ipc.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\carbon\human\species_types\jellypeople.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\silicon\ai\vox_sounds.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\silicon\robot\dogborg_equipment.dm"
|
||||
#include "modular_citadel\code\modules\mob\living\silicon\robot\robot.dm"
|
||||
|
||||
Reference in New Issue
Block a user