Skip to content

Commit

Permalink
REMOVES UNUSED ASSETS AND MAP CAMO TO BE READDED AT A LATER DATE WHEN…
Browse files Browse the repository at this point in the history
… THEY ARE MORE COMPLETE
  • Loading branch information
spartanbobby committed Aug 5, 2023
1 parent 0375fa2 commit acfacad
Show file tree
Hide file tree
Showing 22 changed files with 4 additions and 22 deletions.
12 changes: 0 additions & 12 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1115,10 +1115,6 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
item_state = "backpack_large"
max_storage_space = 26

/obj/item/storage/backpack/rmc/heavy/black //alt backpack, unused
icon_state = "black_backpack_large"
item_state = "black_backpack_large"

/obj/item/storage/backpack/rmc/medium
name = "\improper standard RMC backpack"
desc = "A TWE military standard-carry RMC combat pack MK3."
Expand All @@ -1127,10 +1123,6 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
worn_accessible = TRUE
max_storage_space = 25

/obj/item/storage/backpack/rmc/medium/black //alt backpack, unused
icon_state = "black_backpack_medium"
item_state = "black_backpack_medium"

/obj/item/storage/backpack/rmc/light
name = "\improper lightweight RMC backpack"
desc = "A TWE military light-carry RMC combat pack MK3."
Expand All @@ -1139,10 +1131,6 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
worn_accessible = TRUE
max_storage_space = 23

/obj/item/storage/backpack/rmc/light/black //alt backpack, unused
icon_state = "black_backpack_small"
item_state = "black_backpack_small"

/obj/item/storage/backpack/rmc/frame //One sorry sod should have to lug this about spawns in their shuttle currently
name = "\improper RMC carry-frame"
desc = "A backpack specifically designed to hold equipment for commandos."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/gloves/marine_gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -191,4 +191,4 @@
name = "\improper L6 pattern combat gloves"
desc = "Standard issue tactical gloves used by the royal marines."
icon_state = "rmc_gloves"
flags_atom = NO_NAME_OVERRIDE
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
2 changes: 1 addition & 1 deletion code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = NO_FLAGS
flags_marine_helmet = NO_FLAGS
flags_atom = NO_NAME_OVERRIDE
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE

/obj/item/clothing/head/helmet/marine/veteran/royal_marine/breacher
name = "L5A3 ballistic helmet"
Expand Down
6 changes: 0 additions & 6 deletions code/modules/clothing/shoes/marine_shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,8 @@
items_allowed = list(/obj/item/attachable/bayonet, /obj/item/weapon/throwing_knife, /obj/item/weapon/gun/pistol/holdout, /obj/item/weapon/gun/pistol/clfpistol)
flags_atom = NO_NAME_OVERRIDE

/obj/item/clothing/shoes/royal_marine/snow
icon_state = "s_rmc_boots"

/obj/item/clothing/shoes/royal_marine/knife
/obj/item/clothing/shoes/royal_marine/knife/Initialize(mapload, ...)
. = ..()
stored_item = new /obj/item/attachable/bayonet/rmc(src)
update_icon()

/obj/item/clothing/shoes/royal_marine/knife/snow
icon_state = "s_rmc_boots"
2 changes: 1 addition & 1 deletion code/modules/clothing/suits/marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1735,7 +1735,7 @@
desc = "A customizable personal armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines."
icon_state = "rmc_light"
item_state = "rmc_light"
flags_atom = NO_NAME_OVERRIDE
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
storage_slots = 3
allowed = list(
/obj/item/weapon/gun,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@
desc = "The field uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment"
icon_state = "rmc_uniform"
worn_state = "rmc_uniform"
flags_atom = NO_NAME_OVERRIDE
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
contained_sprite = TRUE
icon = 'icons/mob/humans/onmob/contained/royal_marines_commando.dmi'

Expand Down
Binary file modified icons/mob/humans/onmob/back.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/contained/royal_marines_commando.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/feet.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/head_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_lefthand_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_righthand_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/mask.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/suit_1.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/backpacks.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_hats.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_suits.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/gloves.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/masks.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/shoes.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/ammo_by_faction/twe_ammo.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/guns_by_faction/twe_guns.dmi
Binary file not shown.

0 comments on commit acfacad

Please sign in to comment.