diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 75e37c3ca3d..a62155eb10d 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -1037,7 +1037,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/explosives/grenadier name = "Grenadier's belt" - desc = "A belt containing 25 lethally dangerous and destructive grenades." + desc = "A belt containing 26 lethally dangerous and destructive grenades." item = /obj/item/storage/belt/grenade/full cost = 30 surplus = 0 @@ -1052,15 +1052,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) gamemodes = list(/datum/game_mode/nuclear) surplus = 35 -/datum/uplink_item/explosives/saringrenades - name = "Sarin Gas Grenades" - desc = "A box of four (4) grenades filled with Sarin, a deadly neurotoxin. Use extreme caution when handling and be sure to vacate the premise after using; ensure communication is maintained with team to avoid accidental gassings." - reference = "TGG" - item = /obj/item/storage/box/syndie_kit/sarin - cost = 12 - gamemodes = list(/datum/game_mode/nuclear) - surplus = 0 - /datum/uplink_item/explosives/atmosn2ogrenades name = "Knockout Gas Grenades" desc = "A box of two (2) grenades that spread knockout gas over a large area. Equip internals before using one of these." @@ -1651,10 +1642,10 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/bundles_TC/c20r name = "C-20r Bundle" - desc = "Old Faithful: The classic C-20r, bundled with two magazines and a (surplus) suppressor at discount price." + desc = "Old Faithful: The classic C-20r, bundled with three magazines and a (surplus) suppressor at discount price." reference = "C20B" item = /obj/item/storage/backpack/duffel/syndie/c20rbundle - cost = 14 // normally 17 + cost = 18 // normally 21 gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/bundles_TC/cyber_implants @@ -1669,10 +1660,10 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/bundles_TC/medical name = "Medical Bundle" desc = "The support specialist: Aid your fellow operatives with this medical bundle. Contains a tactical medkit, \ - a Donksoft LMG and a box of riot darts." + a medical beam gun and a pair of syndicate magboots." reference = "MEDB" item = /obj/item/storage/backpack/duffel/syndie/med/medicalbundle - cost = 15 // normally 20 + cost = 20 // normally 24 gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/bundles_TC/sniper diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 3e313bcac33..30b61ec8438 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -563,7 +563,7 @@ update_icon() /obj/item/grenade/chem_grenade/saringas - payload_name = "saringas" + payload_name = "sarin gas" desc = "Contains sarin gas; extremely deadly and fast acting; use with extreme caution." stage = READY diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index ddae7d87f85..0fefed4323a 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -389,6 +389,7 @@ ..() new /obj/item/ammo_box/magazine/smgm45(src) new /obj/item/ammo_box/magazine/smgm45(src) + new /obj/item/ammo_box/magazine/smgm45(src) new /obj/item/gun/projectile/automatic/c20r(src) new /obj/item/suppressor/specialoffer(src) @@ -403,13 +404,13 @@ new /obj/item/clothing/glasses/chameleon/thermal(src) /obj/item/storage/backpack/duffel/syndie/med/medicalbundle - desc = "A large duffel bag containing a tactical medkit, a Donksoft machine gun and a big jumbo box of riot darts." + desc = "A large duffel bag containing a tactical medkit, a medical beam gun and a pair of syndicate magboots." /obj/item/storage/backpack/duffel/syndie/med/medicalbundle/New() ..() new /obj/item/storage/firstaid/tactical(src) - new /obj/item/gun/projectile/automatic/l6_saw/toy(src) - new /obj/item/ammo_box/foambox/riot(src) + new /obj/item/clothing/shoes/magboots/syndie(src) + new /obj/item/gun/medbeam(src) /obj/item/storage/backpack/duffel/syndie/c4/New() ..() diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 8ddf93302d5..579f2fddf0b 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -332,6 +332,7 @@ new /obj/item/grenade/gluon(src) new /obj/item/grenade/gluon(src) new /obj/item/grenade/chem_grenade/facid(src) //1 + new /obj/item/grenade/chem_grenade/saringas(src) //1 new /obj/item/grenade/gas/plasma(src) //2 new /obj/item/grenade/gas/plasma(src) new /obj/item/grenade/frag(src) //10 diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 3abfbfd0e19..c4e54c20626 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -82,12 +82,12 @@ /obj/item/reagent_containers/hypospray/combat name = "combat stimulant injector" desc = "A modified air-needle autoinjector, used by support operatives to quickly heal injuries in combat." - amount_per_transfer_from_this = 10 - possible_transfer_amounts = list(10) + amount_per_transfer_from_this = 15 + possible_transfer_amounts = list(15) icon_state = "combat_hypo" - volume = 75 + volume = 90 ignore_flags = 1 // So they can heal their comrades. - list_reagents = list("epinephrine" = 30, "omnizine" = 30, "teporone" = 15) + list_reagents = list("epinephrine" = 30, "weak_omnizine" = 30, "salglu_solution" = 30) /obj/item/reagent_containers/hypospray/combat/nanites desc = "A modified air-needle autoinjector for use in combat situations. Prefilled with expensive medical nanites for rapid healing." diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index 486111821f1..1784cf4741e 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -28,8 +28,8 @@ list_reagents = list("silver_sulfadiazine" = 40) /obj/item/reagent_containers/food/pill/patch/synthflesh - name = "syntheflesh patch" - desc = "Helps with burn injuries." + name = "synthflesh patch" + desc = "Helps with brute and burn injuries." icon_state = "bandaid_med" instant_application = 1 list_reagents = list("synthflesh" = 20)