Skip to content

Commit

Permalink
Moved most of the cloak-related code out of inifnity pack into the mod
Browse files Browse the repository at this point in the history
  • Loading branch information
UEDCommander committed Nov 28, 2023
1 parent 8566631 commit 167e610
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 19 deletions.
4 changes: 4 additions & 0 deletions code/__defines/~mods/~master_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@
// GLIDING - Start
#define DELAY2GLIDESIZE(delay) (world.icon_size / max(ceil(delay / world.tick_lag), 1))
// GLIDING - End

// LOADOUT_ITEMS - Start
#define ACCESSORY_SLOT_OVER "Over"
// LOADOUT_ITEMS - End
11 changes: 5 additions & 6 deletions mods/loadout_items/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ ID мода: LOADOUT_ITEMS

### Оверрайды

- Отсутствуют
- `mods/_master_files/code/modules/clothing/spacesuits/spacesuits.dm`:
- `/obj/item/clothing/suit/space/var/valid_accessory_slots`
<!--
Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
Здесь указываются оверрайды в твоём моде и папке `_master_files`
Expand All @@ -48,7 +49,8 @@ ID мода: LOADOUT_ITEMS

### Дефайны

- Отсутствуют
- `code/__defines/~mods/~master_defines.dm`:
- `ACCESSORY_SLOT_OVER`
<!--
Если требовалось добавить какие-либо дефайны, укажи файлы,
в которые ты их добавил, а также перечисли имена.
Expand All @@ -59,10 +61,7 @@ ID мода: LOADOUT_ITEMS

### Используемые файлы, не содержащиеся в модпаке

- `packs/infinity/~mods/loadout_items/items/clothing/spacesuits/spacesuits.dm`
- `packs/infinity/~mods/loadout_items/items/clothing/accessories/cloak.dm`
- `packs/infinity/~mods/loadout_items/loadout/lists/cloaks.dm`
- `packs/infinity/~mods/loadout_items/loadout/lists/xenowear.dm`
- Отсутствуют

<!--
Будь то немодульный файл или модульный файл, который не содержится в папке,
Expand Down
3 changes: 3 additions & 0 deletions mods/loadout_items/_loadout_items.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
#define MODPACK_LOADOUT_ITEMS

#include "_loadout_items.dm"
#include "code/cloak.dm"
#include "code/shoes.dm"
#include "code/lists/cloaks.dm"
#include "code/lists/xenowear.dm"

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
slot_wear_suit_str = 'packs/infinity/icons/mob/onmob/onmob_accessories.dmi')
item_icons = list(
slot_wear_suit_str = 'packs/infinity/icons/mob/onmob/onmob_accessories.dmi')

sprite_sheets = list(
SPECIES_UNATHI = 'packs/infinity/icons/mob/onmob/onmob_accessories.dmi',
SPECIES_NABBER = 'packs/infinity/icons/mob/onmob/onmob_accessories.dmi'
)

var/fire_resist = T0C+100
allowed = list(/obj/item/tank/oxygen_emergency)
Expand Down
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion packs/infinity/__defines/clothing.dm

This file was deleted.

7 changes: 0 additions & 7 deletions packs/infinity/_pack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define CONTENT_PACK_INFINITY

// DEFINES
#include "__defines\clothing.dm"
#include "__defines\guns.dm"

// DATUMS
Expand All @@ -23,7 +22,6 @@
#include "clothing\accessories\accessory_hand.dm"
#include "clothing\accessories\armor.dm"
#include "clothing\accessories\badge.dm"
#include "clothing\accessories\cloak.dm"
#include "clothing\accessories\collar.dm"
#include "clothing\accessories\locket_custom.dm"
#include "clothing\accessories\other.dm"
Expand Down Expand Up @@ -85,9 +83,4 @@
#include "structures\signs.dm"
#include "structures\table_presets.dm"

// MODS
#include "~mods/loadout_items/items/clothing/spacesuits/spacesuits.dm"
#include "~mods/loadout_items/items/clothing/accessories/cloak.dm"
#include "~mods/loadout_items/loadout/lists/cloaks.dm"
#include "~mods/loadout_items/loadout/lists/xenowear.dm"
#endif

This file was deleted.

0 comments on commit 167e610

Please sign in to comment.