diff --git a/code/datums/supplypacks/ammunition.dm b/code/datums/supplypacks/ammunition.dm deleted file mode 100644 index 95ca56d4e4..0000000000 --- a/code/datums/supplypacks/ammunition.dm +++ /dev/null @@ -1,42 +0,0 @@ -/* -* Here is where any supply packs -* related to weapons live. -*/ -/datum/supply_packs/ammunition - group = "Ammunition" - -/datum/supply_packs/randomised/ammunition - group = "Ammunition" - access = access_security - -/datum/supply_packs/ammunition/shotgunammo - name = "Ballistic ammunition crate" - contains = list( - /obj/item/weapon/storage/box/shotgunammo = 2, - /obj/item/weapon/storage/box/shotgunshells = 2 - ) - cost = 60 - containertype = /obj/structure/closet/crate/secure - containername = "ballistic ammunition crate" - access = access_armory - -/datum/supply_packs/randomised/ammunition/autoammo - name = "Automatic weapon ammunition crate" - num_contained = 6 - contains = list( - /obj/item/ammo_magazine/mc9mmt, - /obj/item/ammo_magazine/mc9mmt/rubber, - /obj/item/ammo_magazine/a556 - ) - cost = 20 - containertype = /obj/structure/closet/crate/secure - containername = "Automatic weapon ammunition crate" - access = access_armory - -/datum/supply_packs/security/beanbagammo - name = "Beanbag shells" - contains = list(/obj/item/weapon/storage/box/beanbags = 3) - cost = 30 - containertype = /obj/structure/closet/crate - containername = "Beanbag shells" - access = null \ No newline at end of file diff --git a/code/datums/supplypacks/atmospherics.dm b/code/datums/supplypacks/atmospherics.dm index 576e7b10ef..91c85f8ac2 100644 --- a/code/datums/supplypacks/atmospherics.dm +++ b/code/datums/supplypacks/atmospherics.dm @@ -2,6 +2,8 @@ * Here is where any supply packs related * to being atmospherics tasks live. */ + + /datum/supply_packs/atmos group = "Atmospherics" diff --git a/code/datums/supplypacks/contraband.dm b/code/datums/supplypacks/contraband.dm index ebddcc6e4c..fa8c237fe8 100644 --- a/code/datums/supplypacks/contraband.dm +++ b/code/datums/supplypacks/contraband.dm @@ -3,6 +3,7 @@ * and require modification of the supply controller live. */ + /datum/supply_packs/randomised/contraband num_contained = 5 contains = list( @@ -17,7 +18,7 @@ containertype = /obj/structure/closet/crate containername = "Unlabeled crate" contraband = 1 - group = "Operations" + group = "Supplies" /datum/supply_packs/security/specialops name = "Special Ops supplies" @@ -31,7 +32,7 @@ containertype = /obj/structure/closet/crate containername = "Special Ops crate" hidden = 1 - + /datum/supply_packs/security/bolt_rifles_mosin name = "Surplus militia rifles" contains = list( diff --git a/code/datums/supplypacks/costumes.dm b/code/datums/supplypacks/costumes.dm index f3de0ee486..c0b11b16bc 100644 --- a/code/datums/supplypacks/costumes.dm +++ b/code/datums/supplypacks/costumes.dm @@ -2,24 +2,14 @@ * Here is where any supply packs * related to weapons live. */ + + /datum/supply_packs/costumes group = "Costumes & Clothes" /datum/supply_packs/randomised/costumes group = "Costumes & Clothes" -/datum/supply_packs/costumes/lasertag - name = "Lasertag equipment" - contains = list( - /obj/item/weapon/gun/energy/lasertag/red, - /obj/item/clothing/suit/redtag, - /obj/item/weapon/gun/energy/lasertag/blue, - /obj/item/clothing/suit/bluetag - ) - containertype = /obj/structure/closet - containername = "Lasertag Closet" - cost = 20 - /datum/supply_packs/costumes/wizard name = "Wizard costume" contains = list( @@ -32,18 +22,6 @@ containertype = /obj/structure/closet/crate containername = "Wizard costume crate" -/datum/supply_packs/costumes/foam_weapons - name = "Foam Weapon Crate" - contains = list( - /obj/item/weapon/material/sword/foam = 2, - /obj/item/weapon/material/twohanded/baseballbat/foam = 2, - /obj/item/weapon/material/twohanded/spear/foam = 2, - /obj/item/weapon/material/twohanded/fireaxe/foam = 2 - ) - cost = 80 - containertype = /obj/structure/closet/crate - containername = "foam weapon crate" - /datum/supply_packs/randomised/costumes/hats num_contained = 4 contains = list( @@ -129,4 +107,59 @@ name = "Formalwear closet" cost = 30 containertype = /obj/structure/closet - containername = "Formalwear for the best occasions." \ No newline at end of file + containername = "Formalwear for the best occasions." + +datum/supply_packs/misc/witch + name = "Witch costume" + containername = "Witch costume" + containertype = /obj/structure/closet + cost = 20 + contains = list( + /obj/item/clothing/suit/wizrobe/marisa/fake, + /obj/item/clothing/shoes/sandal, + /obj/item/clothing/head/wizard/marisa/fake, + /obj/item/weapon/staff/broom + ) + +/datum/supply_packs/randomised/costumes/costume_hats + name = "Costume hats" + containername = "Actor hats crate" + containertype = /obj/structure/closet + cost = 10 + num_contained = 3 + contains = list( + /obj/item/clothing/head/redcoat, + /obj/item/clothing/head/mailman, + /obj/item/clothing/head/plaguedoctorhat, + /obj/item/clothing/head/pirate, + /obj/item/clothing/head/hasturhood, + /obj/item/clothing/head/powdered_wig, + /obj/item/clothing/head/hairflower, + /obj/item/clothing/head/hairflower/yellow, + /obj/item/clothing/head/hairflower/blue, + /obj/item/clothing/head/hairflower/pink, + /obj/item/clothing/mask/gas/owl_mask, + /obj/item/clothing/mask/gas/monkeymask, + /obj/item/clothing/head/helmet/gladiator, + /obj/item/clothing/head/ushanka + ) + +/datum/supply_packs/randomised/costumes/dresses + name = "Womens formal dress locker" + containername = "Pretty dress locker" + containertype = /obj/structure/closet + cost = 15 + num_contained = 3 + contains = list( + /obj/item/clothing/under/wedding/bride_orange, + /obj/item/clothing/under/wedding/bride_purple, + /obj/item/clothing/under/wedding/bride_blue, + /obj/item/clothing/under/wedding/bride_red, + /obj/item/clothing/under/wedding/bride_white, + /obj/item/clothing/under/sundress, + /obj/item/clothing/under/dress/dress_green, + /obj/item/clothing/under/dress/dress_pink, + /obj/item/clothing/under/dress/dress_orange, + /obj/item/clothing/under/dress/dress_yellow, + /obj/item/clothing/under/dress/dress_saloon + ) \ No newline at end of file diff --git a/code/datums/supplypacks/engineering.dm b/code/datums/supplypacks/engineering.dm index 671c9410b6..900419d0d3 100644 --- a/code/datums/supplypacks/engineering.dm +++ b/code/datums/supplypacks/engineering.dm @@ -2,6 +2,8 @@ * Here is where any supply packs * related to engineering tasks live. */ + + /datum/supply_packs/eng group = "Engineering" diff --git a/code/datums/supplypacks/hospitality.dm b/code/datums/supplypacks/hospitality.dm index 7eb12f2fd4..6dd421b243 100644 --- a/code/datums/supplypacks/hospitality.dm +++ b/code/datums/supplypacks/hospitality.dm @@ -2,6 +2,8 @@ * Here is where any supply packs related * to being hospitable tasks live */ + + /datum/supply_packs/hospitality group = "Hospitality" @@ -58,4 +60,3 @@ cost = 15 containertype = /obj/structure/closet/crate/freezer containername = "Pizza crate" - diff --git a/code/datums/supplypacks/hydroponics.dm b/code/datums/supplypacks/hydroponics.dm index 624821b5b4..a9a26fd561 100644 --- a/code/datums/supplypacks/hydroponics.dm +++ b/code/datums/supplypacks/hydroponics.dm @@ -2,6 +2,8 @@ * Here is where any supply packs * related to hydroponics tasks live. */ + + /datum/supply_packs/hydro group = "Hydroponics" diff --git a/code/datums/supplypacks/materials.dm b/code/datums/supplypacks/materials.dm index ec72a6a7a7..b25565ae0f 100644 --- a/code/datums/supplypacks/materials.dm +++ b/code/datums/supplypacks/materials.dm @@ -3,6 +3,7 @@ * related to materials live. */ + /datum/supply_packs/materials group = "Materials" diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm index 93b779ac1d..c7cc7dc575 100644 --- a/code/datums/supplypacks/medical.dm +++ b/code/datums/supplypacks/medical.dm @@ -2,6 +2,8 @@ * Here is where any supply packs * related to medical tasks live. */ + + /datum/supply_packs/med group = "Medical" diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index 6193f929f4..80c25b48a3 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -2,6 +2,8 @@ * Here is where any supply packs * that don't belong elsewhere live. */ + + /datum/supply_packs/misc group = "Miscellaneous" @@ -28,61 +30,6 @@ containertype = /obj/structure/closet/crate containername = "EFTPOS crate" -/datum/supply_packs/misc/witch - name = "Witch costume" - containername = "Witch costume" - containertype = /obj/structure/closet - cost = 20 - contains = list( - /obj/item/clothing/suit/wizrobe/marisa/fake, - /obj/item/clothing/shoes/sandal, - /obj/item/clothing/head/wizard/marisa/fake, - /obj/item/weapon/staff/broom - ) - -/datum/supply_packs/randomised/misc/costume_hats - name = "Costume hats" - containername = "Actor hats crate" - containertype = /obj/structure/closet - cost = 10 - num_contained = 3 - contains = list( - /obj/item/clothing/head/redcoat, - /obj/item/clothing/head/mailman, - /obj/item/clothing/head/plaguedoctorhat, - /obj/item/clothing/head/pirate, - /obj/item/clothing/head/hasturhood, - /obj/item/clothing/head/powdered_wig, - /obj/item/clothing/head/hairflower, - /obj/item/clothing/head/hairflower/yellow, - /obj/item/clothing/head/hairflower/blue, - /obj/item/clothing/head/hairflower/pink, - /obj/item/clothing/mask/gas/owl_mask, - /obj/item/clothing/mask/gas/monkeymask, - /obj/item/clothing/head/helmet/gladiator, - /obj/item/clothing/head/ushanka - ) - -/datum/supply_packs/randomised/misc/dresses - name = "Womens formal dress locker" - containername = "Pretty dress locker" - containertype = /obj/structure/closet - cost = 15 - num_contained = 3 - contains = list( - /obj/item/clothing/under/wedding/bride_orange, - /obj/item/clothing/under/wedding/bride_purple, - /obj/item/clothing/under/wedding/bride_blue, - /obj/item/clothing/under/wedding/bride_red, - /obj/item/clothing/under/wedding/bride_white, - /obj/item/clothing/under/sundress, - /obj/item/clothing/under/dress/dress_green, - /obj/item/clothing/under/dress/dress_pink, - /obj/item/clothing/under/dress/dress_orange, - /obj/item/clothing/under/dress/dress_yellow, - /obj/item/clothing/under/dress/dress_saloon - ) - /datum/supply_packs/misc/chaplaingear name = "Chaplain equipment" contains = list( @@ -101,39 +48,6 @@ containertype = "/obj/structure/closet/crate" containername = "Chaplain equipment crate" -/datum/supply_packs/misc/artscrafts - name = "Arts and Crafts supplies" - contains = list( - /obj/item/weapon/storage/fancy/crayons, - /obj/item/device/camera, - /obj/item/device/camera_film = 2, - /obj/item/weapon/storage/photo_album, - /obj/item/weapon/packageWrap, - /obj/item/weapon/reagent_containers/glass/paint/red, - /obj/item/weapon/reagent_containers/glass/paint/green, - /obj/item/weapon/reagent_containers/glass/paint/blue, - /obj/item/weapon/reagent_containers/glass/paint/yellow, - /obj/item/weapon/reagent_containers/glass/paint/purple, - /obj/item/weapon/reagent_containers/glass/paint/black, - /obj/item/weapon/reagent_containers/glass/paint/white, - /obj/item/weapon/contraband/poster, - /obj/item/weapon/wrapping_paper = 3 - ) - cost = 10 - containertype = "/obj/structure/closet/crate" - containername = "Arts and Crafts crate" - -/datum/supply_packs/misc/painters - name = "Station Painting Supplies" - cost = 10 - containername = "station painting supplies crate" - containertype = /obj/structure/closet/crate - contains = list( - /obj/item/device/pipe_painter = 2, - /obj/item/device/floor_painter = 2, - /obj/item/device/closet_painter = 2 - ) - /datum/supply_packs/misc/hoverpod name = "Hoverpod Shipment" contains = list() diff --git a/code/datums/supplypacks/weaponry.dm b/code/datums/supplypacks/munitions.dm similarity index 66% rename from code/datums/supplypacks/weaponry.dm rename to code/datums/supplypacks/munitions.dm index ad86a4c50d..a33c9accac 100644 --- a/code/datums/supplypacks/weaponry.dm +++ b/code/datums/supplypacks/munitions.dm @@ -3,14 +3,14 @@ * related to weapons live. */ -/datum/supply_packs/weaponry - group = "Weaponry" +/datum/supply_packs/munitions + group = "Munitions" -/datum/supply_packs/randomised/weaponry - group = "Weaponry" +/datum/supply_packs/randomised/munitions + group = "Munitions" access = access_security -/datum/supply_packs/weaponry/weapons +/datum/supply_packs/munitions/weapons name = "Weapons crate" contains = list( /obj/item/weapon/melee/baton = 2, @@ -23,7 +23,7 @@ containertype = /obj/structure/closet/crate/secure/weapon containername = "Weapons crate" -/datum/supply_packs/weaponry/flareguns +/datum/supply_packs/munitions/flareguns name = "Flare guns crate" contains = list( /obj/item/weapon/gun/projectile/sec/flash, @@ -35,7 +35,7 @@ containertype = /obj/structure/closet/crate/secure/weapon containername = "Flare gun crate" -/datum/supply_packs/weaponry/eweapons +/datum/supply_packs/munitions/eweapons name = "Experimental weapons crate" contains = list( /obj/item/weapon/gun/energy/xray = 2, @@ -45,7 +45,7 @@ containername = "Experimental weapons crate" access = access_armory -/datum/supply_packs/weaponry/energyweapons +/datum/supply_packs/munitions/energyweapons name = "Energy weapons crate" contains = list(/obj/item/weapon/gun/energy/laser = 3) cost = 50 @@ -53,7 +53,7 @@ containername = "energy weapons crate" access = access_armory -/datum/supply_packs/weaponry/shotgun +/datum/supply_packs/munitions/shotgun name = "Shotgun crate" contains = list( /obj/item/weapon/storage/box/shotgunammo, @@ -65,7 +65,7 @@ containername = "Shotgun crate" access = access_armory -/datum/supply_packs/weaponry/erifle +/datum/supply_packs/munitions/erifle name = "Energy marksman crate" contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2) cost = 90 @@ -73,7 +73,7 @@ containername = "Energy marksman crate" access = access_armory -/datum/supply_packs/weaponry/ionweapons +/datum/supply_packs/munitions/ionweapons name = "Electromagnetic weapons crate" contains = list( /obj/item/weapon/gun/energy/ionrifle = 2, @@ -84,7 +84,7 @@ containername = "electromagnetic weapons crate" access = access_armory -/datum/supply_packs/randomised/weaponry/automatic +/datum/supply_packs/randomised/munitions/automatic name = "Automatic weapon crate" num_contained = 2 contains = list( @@ -96,7 +96,7 @@ containername = "Automatic weapon crate" access = access_armory -/datum/supply_packs/weaponry/energy_guns +/datum/supply_packs/munitions/energy_guns name = "energy guns crate" contains = list(/obj/item/weapon/gun/energy/gun = 2) cost = 50 @@ -104,7 +104,7 @@ containername = "energy guns crate" access = access_armory -/datum/supply_packs/weaponry/bolt_rifles_competitive +/datum/supply_packs/munitions/bolt_rifles_competitive name = "Competitive shooting crate" contains = list( /obj/item/device/assembly/timer, @@ -116,4 +116,36 @@ ) cost = 40 containertype = /obj/structure/closet/crate/secure/weapon - containername = "Weapons crate" \ No newline at end of file + containername = "Weapons crate" + +/datum/supply_packs/munitions/shotgunammo + name = "Ballistic ammunition crate" + contains = list( + /obj/item/weapon/storage/box/shotgunammo = 2, + /obj/item/weapon/storage/box/shotgunshells = 2 + ) + cost = 60 + containertype = /obj/structure/closet/crate/secure + containername = "ballistic ammunition crate" + access = access_armory + +/datum/supply_packs/randomised/munitions/autoammo + name = "Automatic weapon ammunition crate" + num_contained = 6 + contains = list( + /obj/item/ammo_magazine/mc9mmt, + /obj/item/ammo_magazine/mc9mmt/rubber, + /obj/item/ammo_magazine/a556 + ) + cost = 20 + containertype = /obj/structure/closet/crate/secure + containername = "Automatic weapon ammunition crate" + access = access_armory + +/datum/supply_packs/munitions/beanbagammo + name = "Beanbag shells" + contains = list(/obj/item/weapon/storage/box/beanbags = 3) + cost = 30 + containertype = /obj/structure/closet/crate + containername = "Beanbag shells" + access = null diff --git a/code/datums/supplypacks/recreation.dm b/code/datums/supplypacks/recreation.dm new file mode 100644 index 0000000000..18895b48f4 --- /dev/null +++ b/code/datums/supplypacks/recreation.dm @@ -0,0 +1,69 @@ +/* +* Here is where any supply packs +* related to recreation live. +*/ + + +/datum/supply_packs/recreation + group = "Recreation" + +/datum/supply_packs/randomised/recreation + group = "Recreation" + access = access_security + +/datum/supply_packs/recreation/foam_weapons + name = "Foam Weapon Crate" + contains = list( + /obj/item/weapon/material/sword/foam = 2, + /obj/item/weapon/material/twohanded/baseballbat/foam = 2, + /obj/item/weapon/material/twohanded/spear/foam = 2, + /obj/item/weapon/material/twohanded/fireaxe/foam = 2 + ) + cost = 80 + containertype = /obj/structure/closet/crate + containername = "foam weapon crate" + +/datum/supply_packs/recreation/lasertag + name = "Lasertag equipment" + contains = list( + /obj/item/weapon/gun/energy/lasertag/red, + /obj/item/clothing/suit/redtag, + /obj/item/weapon/gun/energy/lasertag/blue, + /obj/item/clothing/suit/bluetag + ) + containertype = /obj/structure/closet + containername = "Lasertag Closet" + cost = 20 + +/datum/supply_packs/recreation/artscrafts + name = "Arts and Crafts supplies" + contains = list( + /obj/item/weapon/storage/fancy/crayons, + /obj/item/device/camera, + /obj/item/device/camera_film = 2, + /obj/item/weapon/storage/photo_album, + /obj/item/weapon/packageWrap, + /obj/item/weapon/reagent_containers/glass/paint/red, + /obj/item/weapon/reagent_containers/glass/paint/green, + /obj/item/weapon/reagent_containers/glass/paint/blue, + /obj/item/weapon/reagent_containers/glass/paint/yellow, + /obj/item/weapon/reagent_containers/glass/paint/purple, + /obj/item/weapon/reagent_containers/glass/paint/black, + /obj/item/weapon/reagent_containers/glass/paint/white, + /obj/item/weapon/contraband/poster, + /obj/item/weapon/wrapping_paper = 3 + ) + cost = 10 + containertype = "/obj/structure/closet/crate" + containername = "Arts and Crafts crate" + +/datum/supply_packs/recreation/painters + name = "Station Painting Supplies" + cost = 10 + containername = "station painting supplies crate" + containertype = /obj/structure/closet/crate + contains = list( + /obj/item/device/pipe_painter = 2, + /obj/item/device/floor_painter = 2, + /obj/item/device/closet_painter = 2 + ) \ No newline at end of file diff --git a/code/datums/supplypacks/robotics.dm b/code/datums/supplypacks/robotics.dm index 4a8c91714b..090f3d2078 100644 --- a/code/datums/supplypacks/robotics.dm +++ b/code/datums/supplypacks/robotics.dm @@ -3,6 +3,7 @@ * related to robotics tasks live. */ + /datum/supply_packs/robotics group = "Robotics" diff --git a/code/datums/supplypacks/science.dm b/code/datums/supplypacks/science.dm index 28187873b8..e95cb2d9cf 100644 --- a/code/datums/supplypacks/science.dm +++ b/code/datums/supplypacks/science.dm @@ -3,7 +3,7 @@ * related to security tasks live */ /datum/supply_packs/sci - group = "Security" + group = "Science" /datum/supply_packs/sci/coolanttank name = "Coolant tank crate" diff --git a/code/datums/supplypacks/security.dm b/code/datums/supplypacks/security.dm index 909c2bb84f..483d8e0c12 100644 --- a/code/datums/supplypacks/security.dm +++ b/code/datums/supplypacks/security.dm @@ -2,6 +2,8 @@ * Here is where any supply packs * related to security tasks live */ + + /datum/supply_packs/security group = "Security" access = access_security diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index ec3841a58d..e9832b3657 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -2,10 +2,10 @@ * Here is where any supply packs * related to civilian tasks live */ + /datum/supply_packs/supply group = "Supplies" - /datum/supply_packs/supply/food name = "Kitchen supply crate" contains = list( diff --git a/code/datums/supplypacks/supplypacks.dm b/code/datums/supplypacks/supplypacks.dm index a320c42905..7bb66875ac 100644 --- a/code/datums/supplypacks/supplypacks.dm +++ b/code/datums/supplypacks/supplypacks.dm @@ -5,7 +5,22 @@ //BIG NOTE: Don't add living things to crates, that's bad, it will break the shuttle. //NEW NOTE: Do NOT set the price of any crates below 7 points. Doing so allows infinite points. -var/list/all_supply_groups = list("Operations","Security","Hospitality","Engineering","Atmospherics","Medical","Reagents","Reagent Cartridges","Science","Hydroponics", "Supply", "Miscellaneous") +//var/list/all_supply_groups = list("Operations","Security","Hospitality","Engineering","Atmospherics","Medical","Reagents","Reagent Cartridges","Science","Hydroponics", "Supply", "Miscellaneous") +var/list/all_supply_groups = list("Atmospherics", + "Costumes & Clothes", + "Engineering", + "Hospitality", + "Materials", + "Medical", + "Miscellaneous", + "Reagents", + "Reagent Cartridges", + "Recreation", + "Robotics", + "Science", + "Security", + "Supplies", + "Voidsuits") /datum/supply_packs var/name = null diff --git a/code/datums/supplypacks/voidsuits.dm b/code/datums/supplypacks/voidsuits.dm index f246bfd78f..3d37bd171a 100644 --- a/code/datums/supplypacks/voidsuits.dm +++ b/code/datums/supplypacks/voidsuits.dm @@ -3,6 +3,7 @@ * related to voidsuits live. */ + /datum/supply_packs/voidsuits group = "Voidsuits" diff --git a/polaris.dme b/polaris.dme index 42a3f64e9e..2e3d026be1 100644 --- a/polaris.dme +++ b/polaris.dme @@ -195,7 +195,6 @@ #include "code\datums\repositories\cameras.dm" #include "code\datums\repositories\crew.dm" #include "code\datums\repositories\repository.dm" -#include "code\datums\supplypacks\ammunition.dm" #include "code\datums\supplypacks\atmospherics.dm" #include "code\datums\supplypacks\contraband.dm" #include "code\datums\supplypacks\costumes.dm" @@ -205,13 +204,14 @@ #include "code\datums\supplypacks\materials.dm" #include "code\datums\supplypacks\medical.dm" #include "code\datums\supplypacks\misc.dm" +#include "code\datums\supplypacks\munitions.dm" +#include "code\datums\supplypacks\recreation.dm" #include "code\datums\supplypacks\robotics.dm" #include "code\datums\supplypacks\science.dm" #include "code\datums\supplypacks\security.dm" #include "code\datums\supplypacks\supply.dm" #include "code\datums\supplypacks\supplypacks.dm" #include "code\datums\supplypacks\voidsuits.dm" -#include "code\datums\supplypacks\weaponry.dm" #include "code\datums\underwear\bottom.dm" #include "code\datums\underwear\socks.dm" #include "code\datums\underwear\top.dm"