Skip to content

Commit

Permalink
Revert "Revert immediately"
Browse files Browse the repository at this point in the history
This reverts commit b3b0a9c.
  • Loading branch information
AmoryBlaine committed Aug 1, 2024
1 parent b3b0a9c commit 36cd1d6
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@
#include "code\datums\elements\traitbound\gun_silenced.dm"
#include "code\datums\elements\traitbound\leadership.dm"
#include "code\datums\emergency_calls\custom.dm"
#include "code\datums\emergency_calls\emergency_call.dm"
#include "code\datums\emergency_calls\forsaken_xenos.dm"
#include "code\datums\entities\chemical_information.dm"
#include "code\datums\entities\clans.dm"
Expand Down Expand Up @@ -1323,7 +1324,6 @@
#include "code\modules\admin\ToRban.dm"
#include "code\modules\admin\game_master\game_master.dm"
#include "code\modules\admin\game_master\game_master_submenu.dm"
#include "code\modules\admin\game_master\resin_panel.dm"
#include "code\modules\admin\game_master\sound_panel.dm"
#include "code\modules\admin\game_master\extra_buttons\rappel_menu.dm"
#include "code\modules\admin\game_master\extra_buttons\rename_platoon.dm"
Expand Down Expand Up @@ -1490,15 +1490,25 @@
#include "code\modules\clothing\spacesuits\spacesuits.dm"
#include "code\modules\clothing\spacesuits\void.dm"
#include "code\modules\clothing\suits\bio.dm"
#include "code\modules\clothing\suits\civilian_suit.dm"
#include "code\modules\clothing\suits\clf_suit.dm"
#include "code\modules\clothing\suits\gimmick_suit.dm"
#include "code\modules\clothing\suits\labcoat.dm"
#include "code\modules\clothing\suits\marine_suit.dm"
#include "code\modules\clothing\suits\miscellaneous.dm"
#include "code\modules\clothing\suits\rmc_suit.dm"
#include "code\modules\clothing\suits\storage.dm"
#include "code\modules\clothing\suits\upp_suit.dm"
#include "code\modules\clothing\suits\utility.dm"
#include "code\modules\clothing\suits\weyland_suit.dm"
#include "code\modules\clothing\under\civilian_uniform.dm"
#include "code\modules\clothing\under\gimmick.dm"
#include "code\modules\clothing\under\marine_uniform.dm"
#include "code\modules\clothing\under\medsci_uniform.dm"
#include "code\modules\clothing\under\rank_pins.dm"
#include "code\modules\clothing\under\ties.dm"
#include "code\modules\clothing\under\under.dm"
#include "code\modules\clothing\under\weyland_uniform.dm"
#include "code\modules\cm_aliens\Ovipositor.dm"
#include "code\modules\cm_aliens\weeds.dm"
#include "code\modules\cm_aliens\XenoStructures.dm"
Expand All @@ -1518,7 +1528,6 @@
#include "code\modules\cm_marines\anti_air.dm"
#include "code\modules\cm_marines\codebook.dm"
#include "code\modules\cm_marines\Donator_Items.dm"
#include "code\modules\cm_marines\Donator_Kits.dm"
#include "code\modules\cm_marines\dropship_ammo.dm"
#include "code\modules\cm_marines\dropship_equipment.dm"
#include "code\modules\cm_marines\m2c.dm"
Expand Down Expand Up @@ -1666,11 +1675,8 @@
#include "code\modules\gear_presets\whiteout.dm"
#include "code\modules\gear_presets\wy.dm"
#include "code\modules\gear_presets\yautja.dm"
#include "code\modules\gear_presets\survivors\misc.dm"
#include "code\modules\gear_presets\survivors\survivors.dm"

#include "code\modules\gear_presets\survivors\lv_522\forcon_survivors.dm"

#include "code\modules\holidays\halloween\decorators.dm"
#include "code\modules\holidays\halloween\pumpkins\patches.dm"
#include "code\modules\holidays\halloween\pumpkins\wearable.dm"
Expand Down

0 comments on commit 36cd1d6

Please sign in to comment.