Permalink
Browse files

Merge pull request #818 from MistakeNot4892/clothes

Vast swathes of icon and path fixes following major removals.
  • Loading branch information...
EmperorJon committed Feb 4, 2019
2 parents bda6fb3 + baba76b commit e6fdd2f8758c31295e1e03c37b48340e08832b01
Showing with 674 additions and 837 deletions.
  1. +0 −1 code/__defines/materials.dm
  2. +17 −17 code/__defines/subsystems.dm
  3. +1 −1 code/_macros.dm
  4. +2 −0 code/controllers/subsystems/initialization/materials.dm
  5. +0 −1 code/controllers/subsystems/jobs.dm
  6. +0 −51 code/datums/appearances/automatic/cardborg.dm
  7. +1 −6 code/datums/outfits/equipment/backpacks.dm
  8. +1 −1 code/game/atoms_movable.dm
  9. +2 −2 code/game/objects/items/devices/flashlight.dm
  10. +0 −2 code/game/objects/items/devices/radio/electropack.dm
  11. +2 −2 code/game/objects/items/devices/radio/encryptionkey.dm
  12. +0 −55 code/game/objects/items/devices/radio/headset.dm
  13. +1 −1 code/game/objects/items/devices/spy_bug.dm
  14. +2 −2 code/game/objects/items/latexballoon.dm
  15. +1 −1 code/game/objects/items/plunger.dm
  16. +1 −1 code/game/objects/items/stacks/rods.dm
  17. +3 −1 code/game/objects/items/stacks/sheets/leather.dm
  18. +6 −11 code/game/objects/items/toys.dm
  19. +2 −1 code/game/objects/items/weapons/RSF.dm
  20. +7 −5 code/game/objects/items/weapons/cards_ids.dm
  21. +1 −12 code/game/objects/items/weapons/defib.dm
  22. +7 −6 code/game/objects/items/weapons/ecigs.dm
  23. +0 −7 code/game/objects/items/weapons/grenades/flashbang.dm
  24. +5 −3 code/game/objects/items/weapons/secrets_disk.dm
  25. +0 −320 code/game/objects/items/weapons/storage/backpack.dm
  26. +2 −2 code/game/objects/items/weapons/storage/bags.dm
  27. +13 −5 code/game/objects/items/weapons/storage/misc.dm
  28. +1 −1 code/game/objects/items/weapons/tape.dm
  29. +1 −5 code/game/objects/random/random.dm
  30. +2 −1 code/modules/admin/admin_verbs.dm
  31. +4 −2 code/modules/assembly/holder.dm
  32. +4 −2 code/modules/assembly/shock_kit.dm
  33. +1 −1 code/modules/client/preference_setup/global/05_settings.dm
  34. +65 −1 code/modules/client/preference_setup/loadout/loadout_definitions.dm
  35. +2 −4 code/modules/clothing/chameleon.dm
  36. +2 −0 code/modules/clothing/clothing.dm
  37. +11 −0 code/modules/clothing/ears/_ears.dm
  38. +36 −0 code/modules/clothing/ears/earrings.dm
  39. +5 −5 code/modules/clothing/glasses/blindfold.dm
  40. +2 −2 code/modules/clothing/gloves/_gloves.dm
  41. +45 −0 code/modules/clothing/head/headwear.dm
  42. +18 −0 code/modules/clothing/head/helmet.dm
  43. +22 −0 code/modules/clothing/head/soft_caps.dm
  44. +7 −0 code/modules/clothing/masks/chewable.dm
  45. +3 −9 code/modules/clothing/spacesuits/rig/modules/combat.dm
  46. +1 −0 code/modules/clothing/spacesuits/rig/modules/utility.dm
  47. +0 −35 code/modules/clothing/spacesuits/rig/rig_pieces.dm
  48. +2 −3 code/modules/clothing/suits/armor.dm
  49. +0 −7 code/modules/clothing/suits/storage.dm
  50. +1 −1 code/modules/clothing/suits/utility.dm
  51. +0 −19 code/modules/clothing/under/_under.dm
  52. +1 −0 code/modules/detectivework/tools/rag.dm
  53. +0 −5 code/modules/food/recipes_microwave.dm
  54. +1 −1 code/modules/games/cards.dm
  55. +2 −2 code/modules/hydroponics/trays/tray_reagents.dm
  56. +0 −1 code/modules/item_worth/worths_list.dm
  57. +2 −12 code/modules/materials/definitions/materials_organic.dm
  58. +3 −5 code/modules/materials/material_sheets.dm
  59. +1 −1 code/modules/mob/living/bot/cleanbot.dm
  60. +2 −2 code/modules/mob/living/bot/ed209bot.dm
  61. +1 −1 code/modules/mob/living/bot/farmbot.dm
  62. +2 −2 code/modules/mob/living/bot/floorbot.dm
  63. +1 −1 code/modules/mob/living/bot/medibot.dm
  64. +1 −1 code/modules/mob/living/bot/secbot.dm
  65. +3 −3 code/modules/mob/living/silicon/robot/robot_modules.dm
  66. +1 −1 code/modules/modular_computers/file_system/computer_file.dm
  67. +1 −2 code/modules/organs/internal/stomach.dm
  68. +0 −38 code/modules/paperwork/paper.dm
  69. +1 −2 code/modules/power/fusion/fuel_assembly/fuel_assembly.dm
  70. +6 −14 code/modules/power/lighting.dm
  71. +1 −1 code/modules/projectiles/ammunition/magnetic.dm
  72. +1 −1 code/modules/projectiles/projectile/special.dm
  73. +2 −2 code/modules/random_map/drop/drop_types.dm
  74. +9 −17 code/modules/reagents/Chemistry-Recipes.dm
  75. +2 −2 code/modules/reagents/reagent_containers/food/condiment.dm
  76. +1 −1 code/modules/reagents/reagent_containers/food/drinks.dm
  77. +0 −21 code/modules/reagents/reagent_containers/food/snacks.dm
  78. +2 −3 code/modules/reagents/reagent_containers/glass.dm
  79. +5 −71 code/modules/smokables/_smokables.dm
  80. +285 −1 code/unit_tests/icon_tests.dm
  81. +6 −1 code/unit_tests/map_tests.dm
  82. +4 −0 europa.dme
  83. BIN icons/mob/onmob/items/lefthand.dmi
  84. BIN icons/mob/onmob/items/lefthand_hats.dmi
  85. BIN icons/mob/onmob/items/lefthand_spacesuits.dmi
  86. BIN icons/mob/onmob/items/lefthand_uniforms.dmi
  87. BIN icons/mob/onmob/items/righthand.dmi
  88. BIN icons/mob/onmob/items/righthand_hats.dmi
  89. BIN icons/mob/onmob/items/righthand_spacesuits.dmi
  90. BIN icons/mob/onmob/items/righthand_uniforms.dmi
  91. BIN icons/mob/onmob/onmob_accessories.dmi
  92. BIN icons/mob/onmob/onmob_back.dmi
  93. BIN icons/mob/onmob/onmob_belt.dmi
  94. BIN icons/mob/onmob/onmob_belt_mirror.dmi
  95. BIN icons/mob/onmob/onmob_ears.dmi
  96. BIN icons/mob/onmob/onmob_eyes.dmi
  97. BIN icons/mob/onmob/onmob_feet.dmi
  98. BIN icons/mob/onmob/onmob_hands.dmi
  99. BIN icons/mob/onmob/onmob_head.dmi
  100. BIN icons/mob/onmob/onmob_id.dmi
  101. BIN icons/mob/onmob/onmob_mask.dmi
  102. BIN icons/mob/onmob/onmob_suit.dmi
  103. BIN icons/mob/onmob/onmob_under.dmi
  104. BIN icons/mob/onmob/onmob_under_lower.dmi
  105. BIN icons/mob/onmob/onmob_under_upper.dmi
  106. BIN icons/obj/ED209.dmi
  107. BIN icons/obj/cigarettes.dmi
  108. BIN icons/obj/cleanbot.dmi
  109. BIN icons/obj/clothing/masks.dmi
  110. BIN icons/obj/clothing/obj_accessories.dmi
  111. BIN icons/obj/clothing/obj_ears.dmi
  112. BIN icons/obj/clothing/obj_hands.dmi
  113. BIN icons/obj/clothing/obj_head.dmi
  114. BIN icons/obj/clothing/obj_suit.dmi
  115. BIN icons/obj/farmbot.dmi
  116. BIN icons/obj/floorbot.dmi
  117. BIN icons/obj/items.dmi
  118. BIN icons/obj/machines/power/fusion.dmi
  119. BIN icons/obj/materials.dmi
  120. BIN icons/obj/medibot.dmi
  121. BIN icons/obj/objects.dmi
  122. BIN icons/obj/rig_modules.dmi
  123. BIN icons/obj/secbot.dmi
  124. +8 −4 maps/cassini/cassini-1.dmm
  125. +2 −0 maps/cassini/cassini_unit_testing.dm
  126. +3 −1 maps/~mapsystem/maps_unit_testing.dm
  127. +2 −2 test/check-paths.sh
@@ -46,7 +46,6 @@
#define MATERIAL_BAUXITE "bauxite"
#define MATERIAL_COPPER "copper"
#define MATERIAL_CARDBOARD "cardboard"
#define MATERIAL_CLOTH "cloth"
#define MATERIAL_CARPET "carpet"
#define MATERIAL_ALUMINIUM "aluminium"

@@ -23,23 +23,23 @@
// Subsystems shutdown in the reverse of the order they initialize in
// The numbers just define the ordering, they are meaningless otherwise.

#define SS_INIT_GARBAGE 16
#define SS_INIT_CHEMISTRY 15
#define SS_INIT_MATERIALS 14
#define SS_INIT_PLANTS 13
#define SS_INIT_ANTAGS 12
#define SS_INIT_CULTURE 11
#define SS_INIT_ICON_UPDATE 10
#define SS_INIT_OVERLAY 9
#define SS_INIT_AO 8
#define SS_INIT_MISC 7
#define SS_INIT_SKYBOX 6
#define SS_INIT_MAPPING 5
#define SS_INIT_JOBS 4
#define SS_INIT_CHAR_SETUP 3
#define SS_INIT_CIRCUIT 2
#define SS_INIT_OPEN_SPACE 1
#define SS_INIT_ATOMS 0
#define SS_INIT_GARBAGE 18
#define SS_INIT_CHEMISTRY 17
#define SS_INIT_MATERIALS 16
#define SS_INIT_PLANTS 15
#define SS_INIT_ANTAGS 14
#define SS_INIT_CULTURE 13
#define SS_INIT_ICON_UPDATE 12
#define SS_INIT_OVERLAY 11
#define SS_INIT_AO 10
#define SS_INIT_MISC 9
#define SS_INIT_SKYBOX 8
#define SS_INIT_MAPPING 7
#define SS_INIT_JOBS 6
#define SS_INIT_CHAR_SETUP 5
#define SS_INIT_CIRCUIT 4
#define SS_INIT_OPEN_SPACE 3
#define SS_INIT_ATOMS 2
#define SS_INIT_MACHINES 1
#define SS_INIT_DEFAULT 0
#define SS_INIT_AIR -1
@@ -89,7 +89,7 @@

#define isCrowbar(A) istype(A, /obj/item/weapon/crowbar)

#define isPlunger(A) istype(A, /obj/item/clothing/mask/plunger) || istype(A, /obj/item/device/plunger/robot)
#define isPlunger(A) istype(A, /obj/item/clothing/mask/plunger) || istype(A, /obj/item/device/plunger_robot)

#define sequential_id(key) uniqueness_repository.Generate(/datum/uniqueness_generator/id_sequential, key)

@@ -40,6 +40,8 @@ SUBSYSTEM_DEF(materials)
. = ..()

/datum/controller/subsystem/materials/proc/get_material_by_name(name)
if(!name)
return null
if(!materials_by_name)
build_material_lists()
. = materials_by_name[name]
@@ -393,7 +393,6 @@ SUBSYSTEM_DEF(jobs)
to_chat(H, "<span class='warning'>Your current species, job, or whitelist status does not permit you to spawn with [thing]!</span>")
continue

world.log << "aaaa [G.slot] [G.path] [json_encode(loadout_taken_slots)] aaaa"
if(!G.slot || G.slot == slot_tie || (G.slot != slot_w_uniform && (G.slot in loadout_taken_slots)))
spawn_in_storage.Add(G)
else if(G.spawn_on_mob(H, H.client.prefs.Gear()[G.display_name]))
@@ -52,54 +52,3 @@

/decl/cardborg_appearance/standard
icon_state = "robot"

/decl/cardborg_appearance/standard/satchel1
backpack_type = /obj/item/weapon/storage/backpack/satchel

/decl/cardborg_appearance/standard/satchel2
backpack_type = /obj/item/weapon/storage/backpack/satchel/grey

/decl/cardborg_appearance/engineering
icon_state = "engineerrobot"
backpack_type = /obj/item/weapon/storage/backpack/industrial

/decl/cardborg_appearance/engineering/satchel
backpack_type = /obj/item/weapon/storage/backpack/satchel/eng

/decl/cardborg_appearance/medical
icon_state = "Medbot"
backpack_type = /obj/item/weapon/storage/backpack/medic

/decl/cardborg_appearance/medical/satchel
backpack_type = /obj/item/weapon/storage/backpack/satchel/med

/decl/cardborg_appearance/science
icon_state = "droid-science"
backpack_type = /obj/item/weapon/storage/backpack/toxins

/decl/cardborg_appearance/science/satchel
backpack_type = /obj/item/weapon/storage/backpack/satchel/tox

/decl/cardborg_appearance/security
icon_state = "securityrobot"
backpack_type = /obj/item/weapon/storage/backpack/security

/decl/cardborg_appearance/security/satchel
backpack_type = /obj/item/weapon/storage/backpack/satchel/sec

/decl/cardborg_appearance/centcom
icon_state = "centcomborg"
backpack_type = /obj/item/weapon/storage/backpack/captain

/decl/cardborg_appearance/centcom/satchel
backpack_type = /obj/item/weapon/storage/backpack/satchel/cap

/decl/cardborg_appearance/syndicate
icon_state = "droid-combat"
backpack_type = /obj/item/weapon/storage/backpack/dufflebag/syndie

/decl/cardborg_appearance/syndicate/med
backpack_type = /obj/item/weapon/storage/backpack/dufflebag/syndie/med

/decl/cardborg_appearance/syndicate/ammo
backpack_type = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo
@@ -17,18 +17,13 @@
path = /obj/item/weapon/storage/backpack
is_default = TRUE

/decl/backpack_outfit/rucksack
name = "Rucksack"
path = /obj/item/weapon/storage/backpack/rucksack
flags = BACKPACK_HAS_TYPE_SELECTION

/decl/backpack_outfit/satchel
name = "Satchel"
path = /obj/item/weapon/storage/backpack/satchel

/decl/backpack_outfit/satchel/New()
..()
tweaks += new/datum/backpack_tweak/selection/specified_types_as_list(typesof(/obj/item/weapon/storage/backpack/satchel/leather) + /obj/item/weapon/storage/backpack/satchel/grey)
tweaks += new/datum/backpack_tweak/selection/specified_types_as_list(typesof(/obj/item/weapon/storage/backpack/satchel/))

/decl/backpack_outfit/messenger_bag
name = "Messenger bag"
@@ -20,7 +20,7 @@
var/throw_range = 7
var/moved_recently = 0
var/mob/pulledby = null
var/item_state = null // Used to specify the item state for the on-mob overlays.
var/item_state = "empty" // Used to specify the item state for the on-mob overlays.
var/does_spin = TRUE // Does the atom spin when thrown (of course it does :P)

/atom/movable/Destroy()
@@ -129,7 +129,7 @@
name = "penlight"
desc = "A pen-sized light, used by medical staff."
icon_state = "penlight"
item_state = ""
item_state = "empty"
obj_flags = OBJ_FLAG_CONDUCTIBLE
slot_flags = SLOT_EARS
w_class = ITEM_SIZE_TINY
@@ -176,7 +176,7 @@
name = "low-power flashlight"
desc = "A miniature lamp, that might be used by small robots."
icon_state = "penlight"
item_state = ""
item_state = "empty"
obj_flags = OBJ_FLAG_CONDUCTIBLE
w_class = ITEM_SIZE_TINY
flashlight_power = 0.25
@@ -27,8 +27,6 @@
if(!user.unEquip(W) || !user.unEquip(src))
return
var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user )
A.icon = 'icons/obj/assemblies.dmi'

W.forceMove(A)
W.master = A
A.part1 = W
@@ -1,10 +1,10 @@

/obj/item/device/encryptionkey/
/obj/item/device/encryptionkey
name = "standard encryption key"
desc = "An encryption key for a radio headset. Contains cypherkeys."
icon = 'icons/obj/radio.dmi'
icon_state = "cypherkey"
item_state = ""
item_state = "empty"
w_class = ITEM_SIZE_TINY
slot_flags = SLOT_EARS
var/translate_binary = 0
@@ -71,10 +71,6 @@
syndie = 1
ks1type = /obj/item/device/encryptionkey/syndicate

/obj/item/device/radio/headset/syndicate/alt
icon_state = "syndie_headset"
item_state = "syndie_headset"

/obj/item/device/radio/headset/syndicate/Initialize()
. = ..()
set_frequency(SYND_FREQ)
@@ -97,23 +93,13 @@
item_state = "headset"
ks1type = /obj/item/device/encryptionkey/headset_sec

/obj/item/device/radio/headset/headset_sec/alt
name = "security bowman headset"
icon_state = "sec_headset_alt"
item_state = "sec_headset_alt"

/obj/item/device/radio/headset/headset_eng
name = "engineering radio headset"
desc = "When the engineers wish to chat like girls."
icon_state = "eng_headset"
item_state = "headset"
ks1type = /obj/item/device/encryptionkey/headset_eng

/obj/item/device/radio/headset/headset_eng/alt
name = "engineering bowman headset"
icon_state = "eng_headset_alt"
item_state = "eng_headset_alt"

/obj/item/device/radio/headset/headset_rob
name = "robotics radio headset"
desc = "Made specifically for the roboticists who cannot decide between departments."
@@ -128,11 +114,6 @@
item_state = "headset"
ks1type = /obj/item/device/encryptionkey/headset_med

/obj/item/device/radio/headset/headset_med/alt
name = "medical bowman headset"
icon_state = "med_headset_alt"
item_state = "med_headset_alt"

/obj/item/device/radio/headset/headset_sci
name = "science radio headset"
desc = "A sciency headset. Like usual."
@@ -154,27 +135,13 @@
item_state = "headset"
ks1type = /obj/item/device/encryptionkey/headset_com

/obj/item/device/radio/headset/headset_com/alt
name = "command bowman headset"
desc = "A headset with a commanding channel."
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
ks1type = /obj/item/device/encryptionkey/headset_com
max_keys = 3

/obj/item/device/radio/headset/heads/captain
name = "captain's headset"
desc = "The headset of the boss."
icon_state = "com_headset"
item_state = "headset"
ks1type = /obj/item/device/encryptionkey/heads/captain

/obj/item/device/radio/headset/heads/captain/alt
name = "captain's bowman headset"
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
max_keys = 3

/obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway.
name = "\improper AI subspace transceiver"
desc = "Integrated AI radio transceiver."
@@ -215,23 +182,13 @@
item_state = "headset"
ks1type = /obj/item/device/encryptionkey/heads/ce

/obj/item/device/radio/headset/heads/ce/alt
name = "chief engineer's bowman headset"
icon_state = "com_headset_alt"
item_state = "com_headset_alt"

/obj/item/device/radio/headset/heads/cmo
name = "chief medical officer's headset"
desc = "The headset of the highly trained medical chief."
icon_state = "com_headset"
item_state = "headset"
ks1type = /obj/item/device/encryptionkey/heads/cmo

/obj/item/device/radio/headset/heads/cmo/alt
name = "chief medical officer's bowman headset"
icon_state = "com_headset_alt"
item_state = "com_headset_alt"

/obj/item/device/radio/headset/heads/hop
name = "head of personnel's headset"
desc = "The headset of the guy who will one day be captain."
@@ -267,25 +224,13 @@
item_state = "headset"
ks1type = /obj/item/device/encryptionkey/headset_mining

/obj/item/device/radio/headset/headset_mining/alt
name = "mining bowman radio headset"
icon_state = "mine_headset_alt"
item_state = "mine_headset_alt"
max_keys = 3

/obj/item/device/radio/headset/headset_cargo
name = "supply radio headset"
desc = "A headset used by the box-pushers."
icon_state = "cargo_headset"
item_state = "headset"
ks1type = /obj/item/device/encryptionkey/headset_cargo

/obj/item/device/radio/headset/headset_cargo/alt
name = "supply bowman headset"
icon_state = "cargo_headset_alt"
item_state = "cargo_headset_alt"
max_keys = 3

/obj/item/device/radio/headset/entertainment
name = "actor's radio headset"
desc = "specially made to make you sound less cheesy."
@@ -3,7 +3,7 @@
desc = "" // Nothing to see here
icon = 'icons/obj/weapons.dmi'
icon_state = "eshield0"
item_state = "nothing"
item_state = "empty"
plane = OBJ_PLANE
layer = BELOW_TABLE_LAYER

@@ -2,7 +2,7 @@
name = "latex glove"
desc = "A latex glove, usually used as a balloon."
icon_state = "latexballon"
item_state = "lgloves"
item_state = "gloves"
force = 0
throwforce = 0
w_class = ITEM_SIZE_SMALL
@@ -23,7 +23,7 @@
return
playsound(src, 'sound/weapons/gunshot/gunshot.ogg', 100, 1)
icon_state = "latexballon_bursted"
item_state = "lgloves"
item_state = "gloves"
loc.assume_air(air_contents)

/obj/item/latexballon/ex_act(severity)
@@ -11,7 +11,7 @@
hitsound = 'sound/effects/plunger.ogg'
matter = list("steel" = 5000)

/obj/item/device/plunger/robot
/obj/item/device/plunger_robot
name = "plunger"
desc = "a plunger. It unclogs things."
icon_state = "plunger_black"
@@ -77,7 +77,7 @@

place_grille(user, user.loc, src)

/obj/item/stack/rods/on_update_icon()
/obj/item/stack/material/rods/on_update_icon()
..()
if(amount == 1)
icon_state = "single-rod"
@@ -1,8 +1,10 @@
/obj/item/stack/animalhide
icon_state = "sheet-hide"

/obj/item/stack/animalhide/human
name = "human skin"
desc = "The by-product of human farming."
singular_name = "human skin piece"
icon_state = "sheet-hide"

/obj/item/stack/animalhide/corgi
name = "corgi hide"
Oops, something went wrong.

0 comments on commit e6fdd2f

Please sign in to comment.