diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 58623b9189c..774f097ca5f 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -39,7 +39,7 @@ /obj/item/weapon/shield/energy name = "energy combat shield" - desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere." + desc = "A shield capable of stopping most melee attacks. Protects user from almost all energy projectiles. It can be retracted, expanded, and stored anywhere." icon = 'icons/obj/weapons.dmi' icon_state = "eshield0" // eshield1 for expanded flags = FPRINT | TABLEPASS| CONDUCT diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 2f896dc623e..18f30f00466 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -206,3 +206,94 @@ ..() new /obj/item/stack/tile/plasteel(src) new /obj/item/weapon/crowbar(src) + +/* + * Duffelbags - My thanks to MrSnapWalk for the original icon and Neinhaus for the job variants - Dave. + */ + + /obj/item/weapon/storage/backpack/duffel + name = "duffelbag" + desc = "A large grey duffelbag designed to hold more items than a regular bag." + icon_override = 'icons/mob/in-hand/duffelbag.dmi' + icon_state = "duffel" + item_state = "duffel" + storage_slots = 10 // Duffelbags can hold more items. + max_combined_w_class = 25 + +/obj/item/weapon/storage/backpack/duffel/syndimed + name = "suspicious duffelbag" + desc = "A black and red duffelbag with a red and white cross sewn onto it." + icon_state = "duffel-syndimed" + item_state = "duffel-syndimed" + +/obj/item/weapon/storage/backpack/duffel/syndiammo + name = "suspicious duffelbag" + desc = "A black and red duffelbag with a patch depicting shotgun shells sewn onto it." + icon_state = "duffel-syndiammo" + item_state = "duffel-syndiammo" + +/obj/item/weapon/storage/backpack/duffel/captain + name = "captain's duffelbag" + desc = "A duffelbag designed to hold large quantities of condoms." + icon_state = "duffel-captain" + item_state = "duffel-captain" + +/obj/item/weapon/storage/backpack/duffel/captain + name = "captain's duffelbag" + desc = "A duffelbag designed to hold large quantities of condoms." + icon_state = "duffel-captain" + item_state = "duffel-captain" + +/obj/item/weapon/storage/backpack/duffel/security + name = "security duffelbag" + desc = "A duffelbag built with robust fabric!" + icon_state = "duffel-security" + item_state = "duffel-security" + +/obj/item/weapon/storage/backpack/duffel/virology + name = "captain's duffelbag" + desc = "A white duffelbag designed to contain biohazards." + icon_state = "duffel-viro" + item_state = "duffel-viro" + +/obj/item/weapon/storage/backpack/duffel/science + name = "scientist duffelbag" + desc = "A duffelbag designed to hold the secrets of space." + icon_state = "duffel-toxins" + item_state = "duffel-toxins" + +/obj/item/weapon/storage/backpack/duffel/genetics + name = "scientist duffelbag" + desc = "A duffelbag designed to hold gibbering monkies." + icon_state = "duffel-toxins" + item_state = "duffel-toxins" + +/obj/item/weapon/storage/backpack/duffel/chemistry + name = "scientist duffelbag" + desc = "A duffelbag designed to hold corrosive substances." + icon_state = "duffel-chemistry" + item_state = "duffel-chemistry" + +/obj/item/weapon/storage/backpack/duffel/medical + name = "medical duffelbag" + desc = "A duffelbag designed to hold medicine." + icon_state = "duffel-med" + item_state = "duffel-med" + +/obj/item/weapon/storage/backpack/duffel/engineering + name = "industrial duffelbag" + desc = "A duffelbag designed to hold tools." + icon_state = "duffel-eng" + item_state = "duffel-eng" + +/obj/item/weapon/storage/backpack/duffel/hydro + name = "hydroponics duffelbag" + desc = "A duffelbag designed to hold seeds and fauna." + icon_state = "duffel-hydro" + item_state = "duffel-hydro" + +/obj/item/weapon/storage/backpack/duffel/clown + name = "smiles von wiggleton" + desc = "A duffelbag designed to hold bananas and bike horns." + icon_state = "duffel-clown" + item_state = "duffel-clown" \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 706ef2a2011..5cbcf53707e 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -37,7 +37,7 @@ /obj/item/weapon/gun/projectile/automatic/c20r name = "\improper C-20r SMG" - desc = "A lightweight, fast firing gun, for when you REALLY need someone dead. Uses 12mm rounds. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp" + desc = "A lightweight, compact bullpup SMG. Uses .45 rounds in medium-capacity magazines and has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp." icon_state = "c20r" item_state = "c20r" w_class = 3.0 @@ -60,7 +60,7 @@ /obj/item/weapon/gun/projectile/automatic/l6_saw name = "\improper L6 SAW" - desc = "A rather traditionally made medium machine gun with a pleasantly lacquered wooden pistol grip. Has 'Aussec Armoury- 2531' engraved on the reciever" + desc = "A heavily modified light machine gun with a tactical plasteel frame resting on a rather traditionally-made belt-fed ballistic weapon. Has 'Aussec Armoury - 2531' engraved on the reciever." icon_state = "l6closed100" item_state = "l6closedmag" w_class = 4 diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index d14e2aee8a2..91e8d67fbda 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -75,7 +75,7 @@ /obj/item/weapon/gun/projectile/automatic/pistol name = "\improper Stechtkin pistol" - desc = "A small, easily concealable gun. Uses 10mm rounds." + desc = "A small, easily concealable gun. Uses 10mm rounds and has a threaded barrel for suppressors." icon_state = "pistol" w_class = 2 silenced = 0 @@ -122,8 +122,8 @@ return /obj/item/weapon/silencer - name = "silencer" - desc = "a silencer" + name = "supressor" + desc = "A universal syndicate small-arms suppressor." icon = 'icons/obj/gun.dmi' icon_state = "silencer" w_class = 2 diff --git a/icons/mob/in-hand/duffelbag.dmi b/icons/mob/in-hand/duffelbag.dmi new file mode 100644 index 00000000000..736febaeba6 Binary files /dev/null and b/icons/mob/in-hand/duffelbag.dmi differ diff --git a/icons/mob/in-hand/swords.dmi b/icons/mob/in-hand/swords.dmi index 7d5baa533f8..ab694938e29 100644 Binary files a/icons/mob/in-hand/swords.dmi and b/icons/mob/in-hand/swords.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index fc8e9ee5e82..7a7f30046ca 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ