diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index d2970154a55..882aea5cc9e 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -104,7 +104,7 @@ var/list/uplink_items = list() name = "C-20r Submachine Gun" desc = "A fully-loaded Scarborough Arms-developed submachine gun that fires 12mm automatic rounds with a 20-round magazine." item = /obj/item/weapon/gun/projectile/automatic/c20r - cost = 8 + cost = 7 gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/dangerous/machinegun @@ -159,7 +159,7 @@ var/list/uplink_items = list() desc = "A chemical sprayer that allows a wide dispersal of selected chemicals. Especially tailored by the Tiger Cooperative, the deadly blend it comes stocked with will disorient, damage, and disable your foes... \ Use with extreme caution, to prevent exposure to yourself and your fellow operatives." item = /obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror - cost = 15 + cost = 10 gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/dangerous/gygax @@ -201,7 +201,7 @@ var/list/uplink_items = list() name = "Ammo-10mm" desc = "An additional 8-round 10mm magazine for use in the Stetchkin pistol." item = /obj/item/ammo_box/magazine/m10mm - cost = 2 + cost = 1 gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/machinegun @@ -241,7 +241,7 @@ var/list/uplink_items = list() name = "Stetchkin Silencer" desc = "Fitted for use on the Stetchkin pistol, this silencer will make its shots quieter when equipped onto it." item = /obj/item/weapon/silencer - cost = 3 + cost = 2 gamemodes = list(/datum/game_mode/nuclear) // STEALTHY TOOLS diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index dd468d164b2..a875435412d 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -31,11 +31,11 @@ on = !on if(on) icon_state = "[icon_state]-on" -// item_state = "[item_state]-on" + // item_state = "[item_state]-on" ion_trail.start() else icon_state = initial(icon_state) -// item_state = initial(item_state) + // item_state = initial(item_state) ion_trail.stop() return @@ -81,6 +81,14 @@ ..() air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) +/obj/item/weapon/tank/jetpack/oxygen/harness + name = "jet harness (oxygen)" + desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks." + icon_state = "jetpack-mini" + item_state = "jetpack-mini" + volume = 40 + throw_range = 7 + w_class = 2 /obj/item/weapon/tank/jetpack/carbondioxide name = "jetpack (carbon dioxide)" diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 07147bbb3c1..f4b31fd97fc 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -12,7 +12,7 @@ /obj/structure/closet/syndicate/personal/New() ..() sleep(2) - new /obj/item/weapon/tank/jetpack/oxygen(src) + new /obj/item/weapon/tank/jetpack/oxygen/harness(src) new /obj/item/clothing/mask/gas/syndicate(src) new /obj/item/clothing/under/syndicate(src) new /obj/item/clothing/head/helmet/space/rig/syndi(src) diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 37b6a3130b7..0e1f8562650 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi index 8c7c88b689f..ab7230f1d21 100644 Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ