Skip to content

Commit

Permalink
Revert "Hyperscale Guns (tgstation#10953)"
Browse files Browse the repository at this point in the history
This reverts commit 2d4f434.
  • Loading branch information
Bizzonium committed Oct 6, 2022
1 parent 8d9dd54 commit ed81252
Show file tree
Hide file tree
Showing 57 changed files with 46 additions and 626 deletions.
27 changes: 0 additions & 27 deletions code/__DEFINES/greyscale_guns.dm

This file was deleted.

11 changes: 0 additions & 11 deletions code/controllers/subsystem/greyscale.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,6 @@ SUBSYSTEM_DEF(greyscale)
cache_list(helmet.colorable_colors, helmet.greyscale_config)
qdel(helmet)

for(var/obj/item/weapon/gun/gun_type AS in subtypesof(/obj/item/weapon/gun))
if(!initial(gun_type.greyscale_config))
continue
var/obj/item/weapon/gun/gun = new gun_type()
cache_list(gun.colorable_colors, gun.greyscale_config)
for(var/key in gun.item_icons)
if(!ispath(gun.item_icons[key], /datum/greyscale_config))
continue
cache_list(gun.colorable_colors, gun.item_icons[key])
qdel(gun)

return ..()

///Proc built to handle cacheing the nested lists of armor colors found in code/modules/clothing/modular_armor
Expand Down
113 changes: 0 additions & 113 deletions code/datums/greyscale/greyscale_configs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -244,119 +244,6 @@
json_config = 'code/datums/greyscale/json_configs/projectiles.json'
icon_file = 'icons/obj/items/projectiles.dmi'



///Guns
//AR-12
/datum/greyscale_config/gun
icon_file = 'icons/Marine/gun_greyscale/t12/t12.dmi'
json_config = 'code/datums/greyscale/json_configs/gun.json'

/datum/greyscale_config/gun/worn
icon_file = 'icons/Marine/gun_greyscale/t12/back.dmi'
json_config = 'code/datums/greyscale/json_configs/gun_worn.json'

/datum/greyscale_config/gun/worn/suit
icon_file = 'icons/Marine/gun_greyscale/t12/suit.dmi'

/datum/greyscale_config/gun/worn/l_hand
icon_file = 'icons/Marine/gun_greyscale/t12/left_hand.dmi'
json_config = 'code/datums/greyscale/json_configs/gun_held.json'

/datum/greyscale_config/gun/worn/r_hand
icon_file = 'icons/Marine/gun_greyscale/t12/right_hand.dmi'
json_config = 'code/datums/greyscale/json_configs/gun_held.json'

//AR-18

/datum/greyscale_config/gun/t18
icon_file = 'icons/Marine/gun_greyscale/t18/t18.dmi'

/datum/greyscale_config/gun/worn/t18
icon_file = 'icons/Marine/gun_greyscale/t18/back.dmi'

/datum/greyscale_config/gun/worn/suit/t18
icon_file = 'icons/Marine/gun_greyscale/t18/suit.dmi'

/datum/greyscale_config/gun/worn/l_hand/t18
icon_file = 'icons/Marine/gun_greyscale/t18/left_hand.dmi'

/datum/greyscale_config/gun/worn/r_hand/t18
icon_file = 'icons/Marine/gun_greyscale/t18/right_hand.dmi'

//MG-42
/datum/greyscale_config/gun/t42
icon_file = 'icons/Marine/gun_greyscale/t42/t42.dmi'

/datum/greyscale_config/gun/worn/t42
icon_file = 'icons/Marine/gun_greyscale/t42/back.dmi'

/datum/greyscale_config/gun/worn/suit/t42
icon_file = 'icons/Marine/gun_greyscale/t42/suit.dmi'

/datum/greyscale_config/gun/worn/l_hand/t42
icon_file = 'icons/Marine/gun_greyscale/t42/left_hand.dmi'

/datum/greyscale_config/gun/worn/r_hand/t42
icon_file = 'icons/Marine/gun_greyscale/t42/right_hand.dmi'

//P-14

/datum/greyscale_config/gun/t14
icon_file = 'icons/Marine/gun_greyscale/t14/t14.dmi'
json_config = 'code/datums/greyscale/json_configs/gun_with_belt.json'

/datum/greyscale_config/gun/t14/l_hand
icon_file = 'icons/Marine/gun_greyscale/t14/left_hand.dmi'
json_config = 'code/datums/greyscale/json_configs/gun_held.json'

/datum/greyscale_config/gun/t14/r_hand
icon_file = 'icons/Marine/gun_greyscale/t14/right_hand.dmi'
json_config = 'code/datums/greyscale/json_configs/gun_held.json'


//SMG-90

/datum/greyscale_config/gun/t90
icon_file = 'icons/Marine/gun_greyscale/t90/t90.dmi'

/datum/greyscale_config/gun/worn/t90
icon_file = 'icons/Marine/gun_greyscale/t90/back.dmi'

/datum/greyscale_config/gun/worn/suit/t90
icon_file = 'icons/Marine/gun_greyscale/t90/suit.dmi'

/datum/greyscale_config/gun/worn/l_hand/t90
icon_file = 'icons/Marine/gun_greyscale/t90/left_hand.dmi'

/datum/greyscale_config/gun/worn/r_hand/t90
icon_file = 'icons/Marine/gun_greyscale/t90/right_hand.dmi'

//SG-35

/datum/greyscale_config/gun/t35
icon_file = 'icons/Marine/gun_greyscale/t35/t35.dmi'

/datum/greyscale_config/gun/worn/t35
icon_file = 'icons/Marine/gun_greyscale/t35/back.dmi'

/datum/greyscale_config/gun/worn/suit/t35
icon_file = 'icons/Marine/gun_greyscale/t35/suit.dmi'

/datum/greyscale_config/gun/worn/l_hand/t35
icon_file = 'icons/Marine/gun_greyscale/t35/left_hand.dmi'

/datum/greyscale_config/gun/worn/r_hand/t35
icon_file = 'icons/Marine/gun_greyscale/t35/right_hand.dmi'




///Gun attachments
/datum/greyscale_config/gun_attachment
icon_file = 'icons/Marine/gun_attachments_greyscale/t35_stock.dmi'
json_config = 'code/datums/greyscale/json_configs/gun_attachment.json'

/*
* MECHS
*/
Expand Down
78 changes: 0 additions & 78 deletions code/datums/greyscale/json_configs/gun.json

This file was deleted.

27 changes: 0 additions & 27 deletions code/datums/greyscale/json_configs/gun_attachment.json

This file was deleted.

52 changes: 0 additions & 52 deletions code/datums/greyscale/json_configs/gun_held.json

This file was deleted.

Loading

0 comments on commit ed81252

Please sign in to comment.