Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Guns, attachables and ammo cleanup. #43

Merged
merged 6 commits into from
Jul 27, 2024
Merged

Guns, attachables and ammo cleanup. #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6fd8ab8
greyscale, colorable and etc gun cleaning.
Helg2 Jul 26, 2024
e691969
reorg
Helg2 Jul 26, 2024
1da0f9f
Update foldable.dm
Helg2 Jul 26, 2024
7066a6c
ammo_datums reorg
Helg2 Jul 26, 2024
8877635
hm
Helg2 Jul 26, 2024
649f512
Merge branch 'master' into guns
Helg2 Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
330 changes: 0 additions & 330 deletions code/datums/greyscale/greyscale_configs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,336 +262,6 @@
json_config = 'code/datums/greyscale/json_configs/projectiles.json'
icon_file = 'icons/obj/items/projectiles.dmi'


/datum/greyscale_config/gun
json_config = 'code/datums/greyscale/json_configs/gun.json'
icon_file ='icons/Marine/greyscale_gun/gun.dmi'
prefix = "t18_"
ignore_states = list("loaded_fire", "belt", "loaded_l", "loaded_a", "unloaded_a")

/datum/greyscale_config/gun/tx11
prefix = "tx11_"
/datum/greyscale_config/gun/tx15
prefix = "tx15_"

/datum/greyscale_config/gun/t90
prefix = "t90_"

/datum/greyscale_config/gun/sg29
prefix = "sg29_"

//Pistols
/datum/greyscale_config/gun/pistol
ignore_states = list("loaded_fire", "loaded_l", "loaded_a", "unloaded_a")
prefix = "tp14_"

/datum/greyscale_config/gun/pistol/tp23
prefix = "tp23_"

/datum/greyscale_config/gun/pistol/tx7
ignore_states = list("loaded_fire", "loaded_l")
prefix = "tx7_"

/datum/greyscale_config/gun/pistol/tep
icon_file ='icons/Marine/greyscale_gun/gun_64.dmi'
ignore_states = list("loaded_fire", "loaded_a", "unloaded_a")
prefix = "tep_"

//Revolvers
/datum/greyscale_config/gun/revolver
json_config = 'code/datums/greyscale/json_configs/gun_revolver.json'
ignore_states = list()
prefix = "tp44_"

//64 pixel guns
/datum/greyscale_config/gun/gun64
icon_file ='icons/Marine/greyscale_gun/gun_64.dmi'
prefix = "t12_"
/datum/greyscale_config/gun/gun64/t42
prefix = "t42_"
/datum/greyscale_config/gun/gun64/t81
prefix = "t81_"
/datum/greyscale_config/gun/gun64/t21
prefix = "t21_"

/datum/greyscale_config/gun/gun64/t60
ignore_states = list("belt", "loaded_l", "loaded_a", "unloaded_a")
prefix = "t60_"

/datum/greyscale_config/gun/gun64/t37
prefix = "t37_"

/datum/greyscale_config/gun/gun64/lasgun
ignore_states = list("loaded_fire", "belt", "loaded_a", "unloaded_a")
prefix = "ter_"

/datum/greyscale_config/gun/gun64/lasgun/tec
prefix = "tec_"

/datum/greyscale_config/gun/gun64/lasgun/tem
prefix = "tem_"

/datum/greyscale_config/gun/gun64/lasgun/tes
prefix = "tes_"


/datum/greyscale_config/gun/gun64/shotgun
json_config = 'code/datums/greyscale/json_configs/gun_shotgun.json'
ignore_states = list()
prefix = "t35_"

/datum/greyscale_config/gun/gun64/shotgun/tl127
prefix = "tl127_"

//Mob Sprites for guns

/datum/greyscale_config/worn_gun
json_config = 'code/datums/greyscale/json_configs/gun_mob.json'
icon_file = 'icons/Marine/greyscale_gun/back.dmi'
prefix = "t12_"

/datum/greyscale_config/worn_gun/t42
prefix = "t42_"

/datum/greyscale_config/worn_gun/t18
prefix = "t18_"

/datum/greyscale_config/worn_gun/t81
prefix = "t81_"

/datum/greyscale_config/worn_gun/t21
prefix = "t21_"

/datum/greyscale_config/worn_gun/t35
prefix = "t35_"

/datum/greyscale_config/worn_gun/tx11
prefix = "tx11_"

/datum/greyscale_config/worn_gun/tx15
prefix = "tx15_"

/datum/greyscale_config/worn_gun/t90
prefix = "t90_"

/datum/greyscale_config/worn_gun/t37
prefix = "t37_"

/datum/greyscale_config/worn_gun/ter
prefix = "ter_"

/datum/greyscale_config/worn_gun/tec
prefix = "tec_"

/datum/greyscale_config/worn_gun/tem
prefix = "tem_"

/datum/greyscale_config/worn_gun/tes
prefix = "tes_"

/datum/greyscale_config/worn_gun/t60
prefix = "t60_"

/datum/greyscale_config/worn_gun/sg29
prefix = "sg29_"

/datum/greyscale_config/worn_gun/tl127
prefix = "tl127_"

/datum/greyscale_config/worn_gun/suit
icon_file = 'icons/Marine/greyscale_gun/suit.dmi'

/datum/greyscale_config/worn_gun/suit/t42
prefix = "t42_"

/datum/greyscale_config/worn_gun/suit/t18
prefix = "t18_"

/datum/greyscale_config/worn_gun/suit/t81
prefix = "t81_"

/datum/greyscale_config/worn_gun/suit/t21
prefix = "t21_"

/datum/greyscale_config/worn_gun/suit/t35
prefix = "t35_"

/datum/greyscale_config/worn_gun/suit/tx11
prefix = "tx11_"

/datum/greyscale_config/worn_gun/suit/tx15
prefix = "tx15_"

/datum/greyscale_config/worn_gun/suit/t90
prefix = "t90_"

/datum/greyscale_config/worn_gun/suit/t37
prefix = "t37_"

/datum/greyscale_config/worn_gun/suit/ter
prefix = "ter_"
/datum/greyscale_config/worn_gun/suit/tec
prefix = "tec_"
/datum/greyscale_config/worn_gun/suit/tem
prefix = "tem_"
/datum/greyscale_config/worn_gun/suit/tes
prefix = "tes_"

/datum/greyscale_config/worn_gun/suit/t60
prefix = "t60_"

/datum/greyscale_config/worn_gun/suit/tl127
prefix = "tl127_"

/datum/greyscale_config/worn_gun/suit/sg29
prefix = "sg29_"

/datum/greyscale_config/gun_inhand
json_config = 'code/datums/greyscale/json_configs/gun_hands.json'
icon_file = 'icons/Marine/greyscale_gun/l_hand.dmi'
prefix = "t12_"

/datum/greyscale_config/gun_inhand/t42
icon_file = 'icons/Marine/greyscale_gun/l_hand_64.dmi'
prefix = "t42_"

/datum/greyscale_config/gun_inhand/t18
prefix = "t18_"

/datum/greyscale_config/gun_inhand/t81
prefix = "t81_"

/datum/greyscale_config/gun_inhand/t21
icon_file = 'icons/Marine/greyscale_gun/l_hand_64.dmi'
prefix = "t21_"

/datum/greyscale_config/gun_inhand/t35
prefix = "t35_"

/datum/greyscale_config/gun_inhand/tx11
prefix = "tx11_"

/datum/greyscale_config/gun_inhand/tx15
prefix = "tx15_"

/datum/greyscale_config/gun_inhand/tp14
prefix = "tp14_"

/datum/greyscale_config/gun_inhand/tp23
prefix = "tp23_"

/datum/greyscale_config/gun_inhand/tp44
prefix = "tp44_"

/datum/greyscale_config/gun_inhand/t90
prefix = "t90_"

/datum/greyscale_config/gun_inhand/t37
icon_file = 'icons/Marine/greyscale_gun/l_hand_64.dmi'
prefix = "t37_"

/datum/greyscale_config/gun_inhand/ter
prefix = "ter_"
/datum/greyscale_config/gun_inhand/tep
prefix = "tep_"
/datum/greyscale_config/gun_inhand/tec
prefix = "tec_"
/datum/greyscale_config/gun_inhand/tem
prefix = "tem_"
/datum/greyscale_config/gun_inhand/tes
prefix = "tes_"

/datum/greyscale_config/gun_inhand/tx7
prefix = "tx7_"

/datum/greyscale_config/gun_inhand/t60
icon_file = 'icons/Marine/greyscale_gun/l_hand_64.dmi'
prefix = "t60_"

/datum/greyscale_config/gun_inhand/tl127
icon_file = 'icons/Marine/greyscale_gun/l_hand_64.dmi'
prefix = "tl127_"

/datum/greyscale_config/gun_inhand/sg29
prefix = "sg29_"

/datum/greyscale_config/gun_inhand/r_hand
icon_file = 'icons/Marine/greyscale_gun/r_hand.dmi'

/datum/greyscale_config/gun_inhand/r_hand/t42
icon_file = 'icons/Marine/greyscale_gun/r_hand_64.dmi'
prefix = "t42_"

/datum/greyscale_config/gun_inhand/r_hand/t18
prefix = "t18_"

/datum/greyscale_config/gun_inhand/r_hand/t81
prefix = "t81_"

/datum/greyscale_config/gun_inhand/r_hand/t21
icon_file = 'icons/Marine/greyscale_gun/r_hand_64.dmi'
prefix = "t21_"

/datum/greyscale_config/gun_inhand/r_hand/t35
prefix = "t35_"

/datum/greyscale_config/gun_inhand/r_hand/tx11
prefix = "tx11_"

/datum/greyscale_config/gun_inhand/r_hand/tx15
prefix = "tx15_"

/datum/greyscale_config/gun_inhand/r_hand/tp14
prefix = "tp14_"

/datum/greyscale_config/gun_inhand/r_hand/tp23
prefix = "tp23_"

/datum/greyscale_config/gun_inhand/r_hand/tp44
prefix = "tp44_"

/datum/greyscale_config/gun_inhand/r_hand/t90
prefix = "t90_"

/datum/greyscale_config/gun_inhand/r_hand/t37
icon_file = 'icons/Marine/greyscale_gun/r_hand_64.dmi'
prefix = "t37_"

/datum/greyscale_config/gun_inhand/r_hand/ter
prefix = "ter_"
/datum/greyscale_config/gun_inhand/r_hand/tep
prefix = "tep_"
/datum/greyscale_config/gun_inhand/r_hand/tec
prefix = "tec_"
/datum/greyscale_config/gun_inhand/r_hand/tem
prefix = "tem_"
/datum/greyscale_config/gun_inhand/r_hand/tes
prefix = "tes_"

/datum/greyscale_config/gun_inhand/r_hand/tx7
prefix = "tx7_"

/datum/greyscale_config/gun_inhand/r_hand/t60
icon_file = 'icons/Marine/greyscale_gun/r_hand_64.dmi'
prefix = "t60_"

/datum/greyscale_config/gun_inhand/r_hand/tl127
icon_file = 'icons/Marine/greyscale_gun/r_hand_64.dmi'
prefix = "tl127_"

/datum/greyscale_config/gun_inhand/r_hand/sg29
prefix = "sg29_"

//Attachments
/datum/greyscale_config/gun_attachment
json_config = 'code/datums/greyscale/json_configs/attachments.json'
icon_file = 'icons/Marine/greyscale_gun/attachments.dmi'

/datum/greyscale_config/gun_attachment_64
json_config = 'code/datums/greyscale/json_configs/attachments_64.json'
icon_file = 'icons/Marine/greyscale_gun/attachments_64.dmi'


/*
* MECHS
*/
Expand Down
Loading
Loading