diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm index d3b147d7eda..557c9fa2237 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm @@ -6357,9 +6357,7 @@ /obj/item/clothing/shoes/jackboots, /obj/item/storage/backpack/duffelbag/sec, /obj/item/storage/backpack/duffelbag/sec/redsec, -/obj/item/storage/backpack/satchel/sec/peacekeeper, /obj/item/storage/backpack/satchel/sec/redsec, -/obj/item/storage/backpack/security/peacekeeper, /obj/item/storage/backpack/security/redsec, /turf/open/floor/cult, /area/ruin/space/has_grav/port_tarkon) @@ -6894,9 +6892,9 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/winterboots, /obj/item/storage/backpack/duffelbag/science, -/obj/item/storage/backpack/duffelbag/robo, +/obj/item/storage/backpack/duffelbag/science/robo, /obj/item/storage/backpack/satchel/science, -/obj/item/storage/backpack/satchel/tox/robo, +/obj/item/storage/backpack/satchel/science/robo, /obj/item/storage/backpack/science, /obj/item/storage/backpack/science/robo, /turf/open/floor/iron, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm index 9a51ae0dc07..d289ae81af8 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm @@ -6117,9 +6117,7 @@ /obj/item/clothing/shoes/jackboots, /obj/item/storage/backpack/duffelbag/sec, /obj/item/storage/backpack/duffelbag/sec/redsec, -/obj/item/storage/backpack/satchel/sec/peacekeeper, /obj/item/storage/backpack/satchel/sec/redsec, -/obj/item/storage/backpack/security/peacekeeper, /obj/item/storage/backpack/security/redsec, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon) @@ -6574,9 +6572,9 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/winterboots, /obj/item/storage/backpack/duffelbag/science, -/obj/item/storage/backpack/duffelbag/robo, +/obj/item/storage/backpack/duffelbag/science/robo, /obj/item/storage/backpack/satchel/science, -/obj/item/storage/backpack/satchel/tox/robo, +/obj/item/storage/backpack/satchel/science/robo, /obj/item/storage/backpack/science, /obj/item/storage/backpack/science/robo, /turf/open/floor/iron, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm index 76c12b2f14e..3c2d9a9db95 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm @@ -5373,9 +5373,7 @@ /obj/item/clothing/shoes/jackboots, /obj/item/storage/backpack/duffelbag/sec, /obj/item/storage/backpack/duffelbag/sec/redsec, -/obj/item/storage/backpack/satchel/sec/peacekeeper, /obj/item/storage/backpack/satchel/sec/redsec, -/obj/item/storage/backpack/security/peacekeeper, /obj/item/storage/backpack/security/redsec, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon) @@ -5755,9 +5753,9 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/winterboots, /obj/item/storage/backpack/duffelbag/science, -/obj/item/storage/backpack/duffelbag/robo, +/obj/item/storage/backpack/duffelbag/science/robo, /obj/item/storage/backpack/satchel/science, -/obj/item/storage/backpack/satchel/tox/robo, +/obj/item/storage/backpack/satchel/science/robo, /obj/item/storage/backpack/science, /obj/item/storage/backpack/science/robo, /turf/open/floor/iron, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm index d2e37b60151..c650fd45050 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm @@ -5869,9 +5869,7 @@ /obj/item/clothing/shoes/jackboots, /obj/item/storage/backpack/duffelbag/sec, /obj/item/storage/backpack/duffelbag/sec/redsec, -/obj/item/storage/backpack/satchel/sec/peacekeeper, /obj/item/storage/backpack/satchel/sec/redsec, -/obj/item/storage/backpack/security/peacekeeper, /obj/item/storage/backpack/security/redsec, /turf/open/floor/iron, /area/ruin/space/has_grav/port_tarkon) @@ -6307,9 +6305,9 @@ /obj/item/clothing/shoes/workboots/mining, /obj/item/clothing/shoes/winterboots, /obj/item/storage/backpack/duffelbag/science, -/obj/item/storage/backpack/duffelbag/robo, +/obj/item/storage/backpack/duffelbag/science/robo, /obj/item/storage/backpack/satchel/science, -/obj/item/storage/backpack/satchel/tox/robo, +/obj/item/storage/backpack/satchel/science/robo, /obj/item/storage/backpack/science, /obj/item/storage/backpack/science/robo, /turf/open/floor/iron, diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm index 7521b7c4021..a93f2b70038 100644 --- a/_maps/RandomZLevels/blackmesa.dmm +++ b/_maps/RandomZLevels/blackmesa.dmm @@ -5565,8 +5565,6 @@ /obj/structure/closet/secure_closet/security, /obj/item/clothing/mask/gas/syndicate/ds, /obj/item/storage/medkit/emergency, -/obj/item/storage/backpack/satchel/sec/peacekeeper, -/obj/item/storage/backpack/security/peacekeeper, /obj/item/keycard/stockroom, /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron/dark, diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 18257b56a32..da40f5f508b 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -7978,7 +7978,7 @@ /obj/effect/turf_decal/tile/dark_red/half/contrasted{ dir = 8 }, -/obj/item/storage/backpack/duffelbag/robo/surgery{ +/obj/item/storage/backpack/duffelbag/science/robo/surgery{ pixel_y = 7 }, /obj/machinery/light/warm/directional/west, diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index 4eefbf573b6..643e4b8a50a 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -49,9 +49,9 @@ ears = /obj/item/radio/headset/headset_sci l_pocket = /obj/item/modular_computer/pda/roboticist - backpack = /obj/item/storage/backpack/science/robo //SKYRAT CHANGE - Roboticist Bags (CHANGE) - satchel = /obj/item/storage/backpack/satchel/tox/robo //SKYRAT CHANGE - Roboticist Bags (CHANGE) - duffelbag = /obj/item/storage/backpack/duffelbag/robo //SKYRAT CHANGE - Roboticist Bags (ADDITION) + backpack = /obj/item/storage/backpack/science/robo //SKYRAT CHANGE - Roboticist Bags + satchel = /obj/item/storage/backpack/satchel/science/robo //SKYRAT CHANGE - Roboticist Bags + duffelbag = /obj/item/storage/backpack/duffelbag/science/robo //SKYRAT ADDITION - Roboticist Bags pda_slot = ITEM_SLOT_LPOCKET skillchips = list(/obj/item/skillchip/job/roboticist) diff --git a/modular_skyrat/master_files/icons/mob/clothing/back.dmi b/modular_skyrat/master_files/icons/mob/clothing/back.dmi index ed42e10d70f..c67cca49358 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/back.dmi and b/modular_skyrat/master_files/icons/mob/clothing/back.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi index f266d65e9f3..f759798da57 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/civilian_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/civilian_digi.dmi index e0a759be5d7..7b129cf66ab 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/civilian_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/civilian_digi.dmi differ diff --git a/modular_skyrat/modules/hop_drip/icons/backpack_lefthand.dmi b/modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_lefthand.dmi similarity index 80% rename from modular_skyrat/modules/hop_drip/icons/backpack_lefthand.dmi rename to modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_lefthand.dmi index bc51c9a76c9..bfcdb98611c 100644 Binary files a/modular_skyrat/modules/hop_drip/icons/backpack_lefthand.dmi and b/modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_lefthand.dmi differ diff --git a/modular_skyrat/modules/hop_drip/icons/backpack_righthand.dmi b/modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_righthand.dmi similarity index 81% rename from modular_skyrat/modules/hop_drip/icons/backpack_righthand.dmi rename to modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_righthand.dmi index dbf6a67174f..a95b22d161a 100644 Binary files a/modular_skyrat/modules/hop_drip/icons/backpack_righthand.dmi and b/modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_righthand.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi b/modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi index d143ba67eca..5b8cc40d53b 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi and b/modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/belts.dmi b/modular_skyrat/master_files/icons/obj/clothing/belts.dmi index 4d0e06d4f56..20a694a2405 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/belts.dmi and b/modular_skyrat/master_files/icons/obj/clothing/belts.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/storage.dmi b/modular_skyrat/master_files/icons/obj/clothing/storage.dmi deleted file mode 100644 index 6ee2b03836c..00000000000 Binary files a/modular_skyrat/master_files/icons/obj/clothing/storage.dmi and /dev/null differ diff --git a/modular_skyrat/modules/blueshield/code/clothing.dm b/modular_skyrat/modules/blueshield/code/clothing.dm index b6086509f56..bc0ec344c9b 100644 --- a/modular_skyrat/modules/blueshield/code/clothing.dm +++ b/modular_skyrat/modules/blueshield/code/clothing.dm @@ -97,25 +97,25 @@ /obj/item/storage/backpack/blueshield name = "blueshield backpack" desc = "A robust backpack issued to Nanotrasen's finest." - icon = 'modular_skyrat/modules/blueshield/icons/backpacks.dmi' + icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' - icon_state = "blueshieldpack" + icon_state = "backpack_blueshield" inhand_icon_state = "securitypack" /obj/item/storage/backpack/satchel/blueshield name = "blueshield satchel" desc = "A robust satchel issued to Nanotrasen's finest." - icon = 'modular_skyrat/modules/blueshield/icons/backpacks.dmi' + icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' - icon_state = "satchel-blueshield" + icon_state = "satchel_blueshield" inhand_icon_state = "satchel-sec" /obj/item/storage/backpack/duffelbag/blueshield name = "blueshield duffelbag" desc = "A robust duffelbag issued to Nanotrasen's finest." - icon = 'modular_skyrat/modules/blueshield/icons/backpacks.dmi' + icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' - icon_state = "duffel-blueshield" + icon_state = "duffel_blueshield" inhand_icon_state = "duffel-sec" //blueshield armor diff --git a/modular_skyrat/modules/blueshield/icons/backpacks.dmi b/modular_skyrat/modules/blueshield/icons/backpacks.dmi deleted file mode 100644 index cb80c4bba31..00000000000 Binary files a/modular_skyrat/modules/blueshield/icons/backpacks.dmi and /dev/null differ diff --git a/modular_skyrat/modules/customization/modules/clothing/storage/backpacks.dm b/modular_skyrat/modules/customization/modules/clothing/storage/backpacks.dm index 09e81ee4b49..b698f99f553 100644 --- a/modular_skyrat/modules/customization/modules/clothing/storage/backpacks.dm +++ b/modular_skyrat/modules/customization/modules/clothing/storage/backpacks.dm @@ -1,8 +1,29 @@ /obj/item/storage/backpack/satchel/crusader //Not very special, really just a satchel texture - icon = 'modular_skyrat/master_files/icons/obj/clothing/storage.dmi' + icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' name = "crusader bandolier" desc = "A bandolier-satchel combination for holding all your dungeon loot." icon_state = "crusader_bandolier" inhand_icon_state = "explorerpack" w_class = WEIGHT_CLASS_BULKY + +/obj/item/storage/backpack/science/robo + name = "robotics backpack" + desc = "A sleek, industrial-strength backpack issued to robotics personnel. Smells faintly of oil." + icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' + icon_state = "backpack_robo" + +/obj/item/storage/backpack/satchel/science/robo + name = "robotics satchel" + desc = "A sleek, industrial-strength satchel issued to robotics personnel. Smells faintly of oil." + icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' + icon_state = "satchel_robo" + +/obj/item/storage/backpack/duffelbag/science/robo + name = "robotics duffelbag" + desc = "A sleek, industrial-strength duffelbag issued to robotics personnel. Smells faintly of oil." + icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' + worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' + icon_state = "duffel_robo" diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm index ff77390872a..ccde3caa2f3 100644 --- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm +++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm @@ -47,37 +47,37 @@ /obj/item/storage/backpack/security icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' - icon_state = "backpack_black" + icon_state = "backpack_security_black" uses_advanced_reskins = TRUE unique_reskin = list( "Black Variant" = list( - RESKIN_ICON_STATE = "backpack_black", - RESKIN_WORN_ICON_STATE = "backpack_black" + RESKIN_ICON_STATE = "backpack_security_black", + RESKIN_WORN_ICON_STATE = "backpack_security_black" ), "White Variant" = list( - RESKIN_ICON_STATE = "backpack_white", - RESKIN_WORN_ICON_STATE = "backpack_white" + RESKIN_ICON_STATE = "backpack_security_white", + RESKIN_WORN_ICON_STATE = "backpack_security_white" ), ) /obj/item/storage/backpack/satchel/sec icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' - icon_state = "security_satchel" + icon_state = "satchel_security" /obj/item/storage/backpack/duffelbag/sec icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' - icon_state = "security_duffle_blue" + icon_state = "duffel_security_black" uses_advanced_reskins = TRUE unique_reskin = list( - "Blue Variant" = list( - RESKIN_ICON_STATE = "security_duffle_blue", - RESKIN_WORN_ICON_STATE = "security_duffle_blue" + "Black Variant" = list( + RESKIN_ICON_STATE = "duffel_security_black", + RESKIN_WORN_ICON_STATE = "duffel_security_black" ), "White Variant" = list( - RESKIN_ICON_STATE = "security_duffle_white", - RESKIN_WORN_ICON_STATE = "security_duffle_white" + RESKIN_ICON_STATE = "duffel_security_white", + RESKIN_WORN_ICON_STATE = "duffel_security_white" ), ) diff --git a/modular_skyrat/modules/hop_drip/code/head_of_personnel.dm b/modular_skyrat/modules/hop_drip/code/head_of_personnel.dm index 35afe5cc1bf..912b111d735 100644 --- a/modular_skyrat/modules/hop_drip/code/head_of_personnel.dm +++ b/modular_skyrat/modules/hop_drip/code/head_of_personnel.dm @@ -1,30 +1,30 @@ /obj/item/storage/backpack/head_of_personnel name = "head of personnel backpack" desc = "A exclusive backpack issued to Nanotrasen's finest second." - icon = 'modular_skyrat/modules/hop_drip/icons/hop_packs.dmi' + icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' - lefthand_file = 'modular_skyrat/modules/hop_drip/icons/backpack_lefthand.dmi' - righthand_file = 'modular_skyrat/modules/hop_drip/icons/backpack_righthand.dmi' - icon_state = "hop_pack" - inhand_icon_state = "hop_pack" + lefthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_lefthand.dmi' + righthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_righthand.dmi' + icon_state = "backpack_hop" + inhand_icon_state = "backpack_hop" /obj/item/storage/backpack/satchel/head_of_personnel name = "head of personnel satchel" desc = "A exclusive satchel issued to Nanotrasen's finest second." - icon = 'modular_skyrat/modules/hop_drip/icons/hop_packs.dmi' + icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' - lefthand_file = 'modular_skyrat/modules/hop_drip/icons/backpack_lefthand.dmi' - righthand_file = 'modular_skyrat/modules/hop_drip/icons/backpack_righthand.dmi' + lefthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_lefthand.dmi' + righthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_righthand.dmi' icon_state = "satchel_hop" inhand_icon_state = "satchel_hop" /obj/item/storage/backpack/duffelbag/head_of_personnel name = "head of personnel duffelbag" desc = "A robust duffelbag issued to Nanotrasen's finest second." - icon = 'modular_skyrat/modules/hop_drip/icons/hop_packs.dmi' + icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' - lefthand_file = 'modular_skyrat/modules/hop_drip/icons/backpack_lefthand.dmi' - righthand_file = 'modular_skyrat/modules/hop_drip/icons/backpack_righthand.dmi' + lefthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_lefthand.dmi' + righthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_righthand.dmi' icon_state = "duffel_hop" inhand_icon_state = "duffel_hop" diff --git a/modular_skyrat/modules/hop_drip/icons/hop_packs.dmi b/modular_skyrat/modules/hop_drip/icons/hop_packs.dmi deleted file mode 100644 index bc32c1e25a6..00000000000 Binary files a/modular_skyrat/modules/hop_drip/icons/hop_packs.dmi and /dev/null differ diff --git a/modular_skyrat/modules/mapping/voidraptor/code/clothing.dm b/modular_skyrat/modules/mapping/voidraptor/code/clothing.dm index 7da15c90bbf..1d3b995e409 100644 --- a/modular_skyrat/modules/mapping/voidraptor/code/clothing.dm +++ b/modular_skyrat/modules/mapping/voidraptor/code/clothing.dm @@ -1,8 +1,8 @@ -/obj/item/storage/backpack/duffelbag/robo/surgery - name = "robotics surgery duffelbag" - desc = "A sleek, industrial-strength duffelbag issued to robotics personnel. This one seems to be designed for holding surgical tools." +/obj/item/storage/backpack/duffelbag/science/robo/surgery + name = "robotics surgical duffelbag" + desc = "A sleek, industrial-strength duffelbag issued to robotics personnel. This one has a tag implying it came stocked with surgical tools." -/obj/item/storage/backpack/duffelbag/robo/surgery/PopulateContents() +/obj/item/storage/backpack/duffelbag/science/robo/surgery/PopulateContents() new /obj/item/scalpel(src) new /obj/item/hemostat(src) new /obj/item/retractor(src) diff --git a/modular_skyrat/modules/modular_vending/code/wardrobes.dm b/modular_skyrat/modules/modular_vending/code/wardrobes.dm index 9d426e54616..ae1abb105d7 100644 --- a/modular_skyrat/modules/modular_vending/code/wardrobes.dm +++ b/modular_skyrat/modules/modular_vending/code/wardrobes.dm @@ -58,6 +58,9 @@ /obj/item/clothing/mask/breath = 2, /obj/item/reagent_containers/cup/bottle/morphine = 2, /obj/item/reagent_containers/syringe = 2, + /obj/item/storage/backpack/science/robo = 2, + /obj/item/storage/backpack/satchel/science/robo = 2, + /obj/item/storage/backpack/duffelbag/science/robo = 2, ) /obj/machinery/vending/wardrobe/science_wardrobe diff --git a/modular_skyrat/modules/roboclothes/code/robotics_clothing.dm b/modular_skyrat/modules/roboclothes/code/robotics_clothing.dm deleted file mode 100644 index 89e0b7a7427..00000000000 --- a/modular_skyrat/modules/roboclothes/code/robotics_clothing.dm +++ /dev/null @@ -1,20 +0,0 @@ -/obj/item/storage/backpack/science/robo - name = "robotics backpack" - desc = "A sleek, industrial-strength backpack issued to robotics personnel. Smells faintly of oil." - icon = 'modular_skyrat/modules/roboclothes/icons/robobag_item.dmi' - worn_icon = 'modular_skyrat/modules/roboclothes/icons/robobag_onmob.dmi' - icon_state = "robopack" - -/obj/item/storage/backpack/satchel/tox/robo - name = "robotics satchel" - desc = "A sleek, industrial-strength satchel issued to robotics personnel. Smells faintly of oil." - icon = 'modular_skyrat/modules/roboclothes/icons/robobag_item.dmi' - worn_icon = 'modular_skyrat/modules/roboclothes/icons/robobag_onmob.dmi' - icon_state = "satchel-robo" - -/obj/item/storage/backpack/duffelbag/robo - name = "robotics duffelbag" - desc = "A sleek, industrial-strength duffelbag issued to robotics personnel. Smells faintly of oil." - icon = 'modular_skyrat/modules/roboclothes/icons/robobag_item.dmi' - worn_icon = 'modular_skyrat/modules/roboclothes/icons/robobag_onmob.dmi' - icon_state = "duffel-robo" diff --git a/modular_skyrat/modules/roboclothes/code/wardrobes.dm b/modular_skyrat/modules/roboclothes/code/wardrobes.dm deleted file mode 100644 index 63b6f790a93..00000000000 --- a/modular_skyrat/modules/roboclothes/code/wardrobes.dm +++ /dev/null @@ -1,5 +0,0 @@ -/obj/machinery/vending/wardrobe/robo_wardrobe/Initialize(mapload) - products[/obj/item/storage/backpack/science/robo] = 3 - products[/obj/item/storage/backpack/satchel/tox/robo] = 3 - products[/obj/item/storage/backpack/duffelbag/robo] = 3 - . = ..() diff --git a/modular_skyrat/modules/roboclothes/icons/robobag_item.dmi b/modular_skyrat/modules/roboclothes/icons/robobag_item.dmi deleted file mode 100644 index d5ce7b6a938..00000000000 Binary files a/modular_skyrat/modules/roboclothes/icons/robobag_item.dmi and /dev/null differ diff --git a/modular_skyrat/modules/roboclothes/icons/robobag_onmob.dmi b/modular_skyrat/modules/roboclothes/icons/robobag_onmob.dmi deleted file mode 100644 index d51c53ef882..00000000000 Binary files a/modular_skyrat/modules/roboclothes/icons/robobag_onmob.dmi and /dev/null differ diff --git a/modular_skyrat/modules/roboclothes/readme.md b/modular_skyrat/modules/roboclothes/readme.md deleted file mode 100644 index 8830df97c51..00000000000 --- a/modular_skyrat/modules/roboclothes/readme.md +++ /dev/null @@ -1,29 +0,0 @@ -ttps://github.com/Skyrat-SS13/Skyrat-tg/pull - -## Title: ROBOTICS CLOTHING - -MODULE ID: ROBOCLOTHES - -### Description: - -Ports over old Robotics Backpacks as well as changes the current TG Robotics labcoat to be more COOL AND SICK (Read: Edgy). - -### TG Proc Changes: - -- Modified the Roboticist job file (code/modules/jobs/job_types/roboticist.dm) to include new robotics backpacks and such. - -### Defines: - -- N/A - -### Master file additions - -- N/A - -### Included files that are not contained in this module: - -- N/A - -### Credits: -ShadeAware - Coding and Spritework. -necromanceranne - Black-Colored Robotics Labcoats. diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_backpack.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_backpack.dm deleted file mode 100644 index 55923a08a21..00000000000 --- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_backpack.dm +++ /dev/null @@ -1,26 +0,0 @@ -/obj/item/storage/backpack/security/peacekeeper - name = "peacekeeper backpack" - desc = "A robust feeling backpack." - icon_state = "peacepack" - icon = 'modular_skyrat/modules/sec_haul/icons/peacekeeper/peacekeeper_items.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' - inhand_icon_state = "securitypack" - -/obj/item/storage/backpack/satchel/sec/peacekeeper - name = "peacekeeper satchel" - desc = "A robust feeling satchel." - icon_state = "peacekeepersatchel" - icon = 'modular_skyrat/modules/sec_haul/icons/peacekeeper/peacekeeper_items.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' - inhand_icon_state = "satchel-sec" - -/obj/item/storage/backpack/duffelbag/sec/peacekeeper - name = "peacekeeper duffelbag" - desc = "A robust feeling duffelbag." - icon_state = "peacekeeperduffle" - icon = 'modular_skyrat/modules/sec_haul/icons/peacekeeper/peacekeeper_items.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi' - inhand_icon_state = "duffel-sec" - - - diff --git a/modular_skyrat/modules/sec_haul/icons/peacekeeper/peacekeeper_items.dmi b/modular_skyrat/modules/sec_haul/icons/peacekeeper/peacekeeper_items.dmi index e0bb5c7241a..93ce28657e9 100644 Binary files a/modular_skyrat/modules/sec_haul/icons/peacekeeper/peacekeeper_items.dmi and b/modular_skyrat/modules/sec_haul/icons/peacekeeper/peacekeeper_items.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 6bcc37f1823..d19a7a62a9d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6764,8 +6764,6 @@ #include "modular_skyrat\modules\records_on_examine\code\record_variables.dm" #include "modular_skyrat\modules\records_on_examine\code\records_procs.dm" #include "modular_skyrat\modules\records_on_examine\code\view_exploitables.dm" -#include "modular_skyrat\modules\roboclothes\code\robotics_clothing.dm" -#include "modular_skyrat\modules\roboclothes\code\wardrobes.dm" #include "modular_skyrat\modules\robohand\code\bodypart_autosurgeon.dm" #include "modular_skyrat\modules\robohand\code\robohand.dm" #include "modular_skyrat\modules\robohand\code\silverhand_bundle.dm" @@ -6799,7 +6797,6 @@ #include "modular_skyrat\modules\sec_haul\code\misc\packs.dm" #include "modular_skyrat\modules\sec_haul\code\misc\vending.dm" #include "modular_skyrat\modules\sec_haul\code\peacekeeper\armadyne_clothing.dm" -#include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_backpack.dm" #include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_clothing.dm" #include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_hammer.dm" #include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_lockers.dm"