Skip to content

Commit

Permalink
orginizes files
Browse files Browse the repository at this point in the history
  • Loading branch information
@FalloutFalcon
FalloutFalcon committed Apr 13, 2024
1 parent 925010f commit 4adba95
Show file tree
Hide file tree
Showing 14 changed files with 13 additions and 13 deletions.
0 code/game/objects/items/chainsaw.dm → code/game/objects/items/melee/chainsaw.dm
View file
File renamed without changes.
0 code/game/objects/items/dualsaber.dm → code/game/objects/items/melee/dualsaber.dm
View file
File renamed without changes.
0 code/game/objects/items/energyhalberd.dm → ...game/objects/items/melee/energyhalberd.dm
View file
File renamed without changes.
0 code/game/objects/items/fireaxe.dm → code/game/objects/items/melee/fireaxe.dm
View file
File renamed without changes.
0 code/game/objects/items/holy_weapons.dm → .../game/objects/items/melee/holy_weapons.dm
View file
File renamed without changes.
0 code/game/objects/items/pitchfork.dm → code/game/objects/items/melee/pitchfork.dm
View file
File renamed without changes.
0 code/game/objects/items/powerfist.dm → code/game/objects/items/melee/powerfist.dm
View file
File renamed without changes.
0 code/game/objects/items/singularityhammer.dm → .../objects/items/melee/singularityhammer.dm
View file
File renamed without changes.
0 code/game/objects/items/spear.dm → code/game/objects/items/melee/spear.dm
View file
File renamed without changes.
0 code/game/objects/items/stunbaton.dm → code/game/objects/items/melee/stunbaton.dm
View file
File renamed without changes.
0 code/game/objects/items/teleprod.dm → code/game/objects/items/melee/teleprod.dm
View file
File renamed without changes.
0 code/game/objects/items/weaponry.dm → code/game/objects/items/melee/weaponry.dm
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion code/game/objects/items/toys.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@
/obj/item/toy/katana
name = "replica katana"
desc = "Woefully underpowered in D20."
icon = 'icons/obj/items_and_weapons.dmi'
icon = 'icons/obj/weapon/sword.dmi'
icon_state = "katana"
item_state = "katana"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
Expand Down
24 changes: 12 additions & 12 deletions shiptest.dme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,6 @@
#include "code\game\objects\items\cardboard_cutouts.dm"
#include "code\game\objects\items\cards_ids.dm"
#include "code\game\objects\items\cash.dm"
#include "code\game\objects\items\chainsaw.dm"
#include "code\game\objects\items\charter.dm"
#include "code\game\objects\items\chromosome.dm"
#include "code\game\objects\items\chrono_eraser.dm"
Expand All @@ -1125,19 +1124,15 @@
#include "code\game\objects\items\dna_injector.dm"
#include "code\game\objects\items\documents.dm"
#include "code\game\objects\items\door_seal.dm"
#include "code\game\objects\items\dualsaber.dm"
#include "code\game\objects\items\dyekit.dm"
#include "code\game\objects\items\eightball.dm"
#include "code\game\objects\items\energyhalberd.dm"
#include "code\game\objects\items\etherealdiscoball.dm"
#include "code\game\objects\items\extinguisher.dm"
#include "code\game\objects\items\fireaxe.dm"
#include "code\game\objects\items\flamethrower.dm"
#include "code\game\objects\items\gift.dm"
#include "code\game\objects\items\granters.dm"
#include "code\game\objects\items\handcuffs.dm"
#include "code\game\objects\items\holosign_creator.dm"
#include "code\game\objects\items\holy_weapons.dm"
#include "code\game\objects\items\hot_potato.dm"
#include "code\game\objects\items\hourglass.dm"
#include "code\game\objects\items\inducer.dm"
Expand All @@ -1150,10 +1145,8 @@
#include "code\game\objects\items\paiwire.dm"
#include "code\game\objects\items\pet_carrier.dm"
#include "code\game\objects\items\pinpointer.dm"
#include "code\game\objects\items\pitchfork.dm"
#include "code\game\objects\items\plushes.dm"
#include "code\game\objects\items\pneumaticCannon.dm"
#include "code\game\objects\items\powerfist.dm"
#include "code\game\objects\items\puzzle_pieces.dm"
#include "code\game\objects\items\RCD.dm"
#include "code\game\objects\items\RCL.dm"
Expand All @@ -1167,20 +1160,15 @@
#include "code\game\objects\items\shrapnel.dm"
#include "code\game\objects\items\shuttle_creator.dm"
#include "code\game\objects\items\signs.dm"
#include "code\game\objects\items\singularityhammer.dm"
#include "code\game\objects\items\spear.dm"
#include "code\game\objects\items\stunbaton.dm"
#include "code\game\objects\items\survery_handheld.dm"
#include "code\game\objects\items\taster.dm"
#include "code\game\objects\items\teleportation.dm"
#include "code\game\objects\items\teleprod.dm"
#include "code\game\objects\items\theft_tools.dm"
#include "code\game\objects\items\toy_mechs.dm"
#include "code\game\objects\items\toys.dm"
#include "code\game\objects\items\trash.dm"
#include "code\game\objects\items\vending_items.dm"
#include "code\game\objects\items\wayfinding.dm"
#include "code\game\objects\items\weaponry.dm"
#include "code\game\objects\items\circuitboards\circuitboard.dm"
#include "code\game\objects\items\circuitboards\computer_circuitboards.dm"
#include "code\game\objects\items\circuitboards\machine_circuitboards.dm"
Expand Down Expand Up @@ -1258,10 +1246,22 @@
#include "code\game\objects\items\implants\implanter.dm"
#include "code\game\objects\items\implants\implantpad.dm"
#include "code\game\objects\items\implants\implantuplink.dm"
#include "code\game\objects\items\melee\chainsaw.dm"
#include "code\game\objects\items\melee\energy.dm"
#include "code\game\objects\items\melee\energyhalberd.dm"
#include "code\game\objects\items\melee\holy_weapons.dm"
#include "code\game\objects\items\melee\misc.dm"
#include "code\game\objects\items\melee\dualsaber.dm"
#include "code\game\objects\items\melee\pitchfork.dm"
#include "code\game\objects\items\melee\powerfist.dm"
#include "code\game\objects\items\melee\singularityhammer.dm"
#include "code\game\objects\items\melee\stunbaton.dm"
#include "code\game\objects\items\melee\teleprod.dm"
#include "code\game\objects\items\melee\transforming.dm"
#include "code\game\objects\items\melee\fireaxe.dm"
#include "code\game\objects\items\melee\weaponry.dm"
#include "code\game\objects\items\robot\ai_upgrades.dm"
#include "code\game\objects\items\melee\spear.dm"
#include "code\game\objects\items\robot\robot_items.dm"
#include "code\game\objects\items\robot\robot_parts.dm"
#include "code\game\objects\items\robot\robot_upgrades.dm"
Expand Down

0 comments on commit 4adba95

Please sign in to comment.