diff --git a/code/datums/supplypacks/voidsuits_vr.dm b/code/datums/supplypacks/voidsuits_vr.dm index e500af3db4d..432b5bbd061 100644 --- a/code/datums/supplypacks/voidsuits_vr.dm +++ b/code/datums/supplypacks/voidsuits_vr.dm @@ -139,3 +139,14 @@ containertype = /obj/structure/closet/crate/secure name = "Commonwealth captain voidsuit crate" access = access_captain + +/datum/supply_pack/voidsuits/csc_breaker + name = "Shipbreaker's Industrial Suit (inc. jetpack)" + contains = list( + /obj/item/clothing/suit/space/void/salvagecorp_shipbreaker, + /obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker, + /obj/item/weapon/tank/jetpack/breaker + ) + cost = 100 + containertype = /obj/structure/closet/crate/secure + name = "Coyote Salvage Corp industrial voidsuit crate" diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 3f0ed8893c8..8bb5bb465b8 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -104,6 +104,16 @@ . = ..() air_contents.adjust_gas("oxygen", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) +/obj/item/weapon/tank/jetpack/breaker + name = "CSC industrial jetpack" + desc = "A JetFast EVA thruster pack. A warning label clearly states \'WARNING: CONTAINS VOLATILE REACTION MASS TOXIC TO MOST LIFEFORMS. NOT TO BE USED WITH CLOSED CYCLE BREATHING SYSTEMS.\'" + icon_state = "jetpack-breaker" + item_state_slots = list(slot_r_hand_str = "jetpack", slot_l_hand_str = "jetpack") + +/obj/item/weapon/tank/jetpack/breaker/Initialize() + . = ..() + air_contents.adjust_gas("volatile_fuel", (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + /obj/item/weapon/tank/jetpack/carbondioxide name = "jetpack (carbon dioxide)" desc = "A tank of compressed carbon dioxide for use as propulsion in zero-gravity areas. Painted black to indicate that it should not be used as a source for internals." diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm index ca48bfcfe17..f543aa48c6d 100644 --- a/code/modules/clothing/spacesuits/void/event_vr.dm +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -258,3 +258,32 @@ species_restricted = list(SPECIES_ALTEVIAN) no_cycle = TRUE + +/obj/item/clothing/suit/space/void/salvagecorp_shipbreaker + name = "\improper CSC industrial voidsuit" + desc = "A heavy-duty Kirillov-Y771 voidsuit intended for use in hazardous shipbreaking, salvage, and industrial operations, manufactured (or more likely refurbished) by the Coyote Salvage Corporation. It's slow and awkward if used outside of microgravity, but it offers good protection for what is technically a civilian-legal voidsuit." + + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "breaker_suit" + + armor = list("melee" = 50, "bullet" = 15, "laser" = 15, "energy" = 25, "bomb" = 45, "bio" = 100, "rad" = 80) + slowdown = 1.5 + breach_threshold = 14 + allowed = list(/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit) + + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM + +/obj/item/clothing/head/helmet/space/void/salvagecorp_shipbreaker + name = "\improper CSC industrial voidsuit helmet" + desc = "A dome/bubble style helmet for use with the Kirillov-Y771 voidsuit. It offers surprisingly good protection and visibility, though wearers are still advised to avoid face-on collisions. Sadly, this one doesn't seem to have the (in)famous 0PTIK3WL cross-spectrum imaging visor installed..." + + icon = 'icons/inventory/head/item_vr.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr.dmi' + icon_state = "breaker_helmet" + + armor = list("melee" = 50, "bullet" = 15, "laser" = 15, "energy" = 25, "bomb" = 45, "bio" = 100, "rad" = 80) + + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB + sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM \ No newline at end of file diff --git a/icons/inventory/back/mob.dmi b/icons/inventory/back/mob.dmi index fac62128ecf..5080e41dc53 100644 Binary files a/icons/inventory/back/mob.dmi and b/icons/inventory/back/mob.dmi differ diff --git a/icons/inventory/back/mob_vr.dmi b/icons/inventory/back/mob_vr.dmi index c06fc667db7..1957895c8cb 100644 Binary files a/icons/inventory/back/mob_vr.dmi and b/icons/inventory/back/mob_vr.dmi differ diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index 6aeead5a247..c184d1888d6 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/item_skrell.dmi b/icons/inventory/head/item_skrell.dmi index 86844d85269..170b02f6b78 100644 Binary files a/icons/inventory/head/item_skrell.dmi and b/icons/inventory/head/item_skrell.dmi differ diff --git a/icons/inventory/head/item_tajaran.dmi b/icons/inventory/head/item_tajaran.dmi index b649db24037..ea142cde28f 100644 Binary files a/icons/inventory/head/item_tajaran.dmi and b/icons/inventory/head/item_tajaran.dmi differ diff --git a/icons/inventory/head/item_unathi.dmi b/icons/inventory/head/item_unathi.dmi index 96ae1725cdf..1a7192761ec 100644 Binary files a/icons/inventory/head/item_unathi.dmi and b/icons/inventory/head/item_unathi.dmi differ diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi index 4d677f12655..1b32d623a1e 100644 Binary files a/icons/inventory/head/item_vr.dmi and b/icons/inventory/head/item_vr.dmi differ diff --git a/icons/inventory/head/item_vr_akula.dmi b/icons/inventory/head/item_vr_akula.dmi index cf2ea231419..412f2081bfa 100644 Binary files a/icons/inventory/head/item_vr_akula.dmi and b/icons/inventory/head/item_vr_akula.dmi differ diff --git a/icons/inventory/head/item_vr_skrell.dmi b/icons/inventory/head/item_vr_skrell.dmi index 9a23e59f203..f1accb8914e 100644 Binary files a/icons/inventory/head/item_vr_skrell.dmi and b/icons/inventory/head/item_vr_skrell.dmi differ diff --git a/icons/inventory/head/item_vr_tajaran.dmi b/icons/inventory/head/item_vr_tajaran.dmi index 2223bafae4a..7b5aaa600f1 100644 Binary files a/icons/inventory/head/item_vr_tajaran.dmi and b/icons/inventory/head/item_vr_tajaran.dmi differ diff --git a/icons/inventory/head/item_vr_unathi.dmi b/icons/inventory/head/item_vr_unathi.dmi index 2223bafae4a..7b5aaa600f1 100644 Binary files a/icons/inventory/head/item_vr_unathi.dmi and b/icons/inventory/head/item_vr_unathi.dmi differ diff --git a/icons/inventory/head/item_vr_vulpkanin.dmi b/icons/inventory/head/item_vr_vulpkanin.dmi index c3be906c447..455c19c0a95 100644 Binary files a/icons/inventory/head/item_vr_vulpkanin.dmi and b/icons/inventory/head/item_vr_vulpkanin.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 2974d0d8838..aded629d431 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/head/mob_skrell.dmi b/icons/inventory/head/mob_skrell.dmi index ab3267b937d..b259b375717 100644 Binary files a/icons/inventory/head/mob_skrell.dmi and b/icons/inventory/head/mob_skrell.dmi differ diff --git a/icons/inventory/head/mob_tajaran.dmi b/icons/inventory/head/mob_tajaran.dmi index 857a1586967..ff0332205cb 100644 Binary files a/icons/inventory/head/mob_tajaran.dmi and b/icons/inventory/head/mob_tajaran.dmi differ diff --git a/icons/inventory/head/mob_unathi.dmi b/icons/inventory/head/mob_unathi.dmi index d78cf385aa2..20301586247 100644 Binary files a/icons/inventory/head/mob_unathi.dmi and b/icons/inventory/head/mob_unathi.dmi differ diff --git a/icons/inventory/head/mob_vr.dmi b/icons/inventory/head/mob_vr.dmi index 9e478ee9d3d..e276c7c1181 100644 Binary files a/icons/inventory/head/mob_vr.dmi and b/icons/inventory/head/mob_vr.dmi differ diff --git a/icons/inventory/head/mob_vr_akula.dmi b/icons/inventory/head/mob_vr_akula.dmi index 6ea289d7f71..18f39e67363 100644 Binary files a/icons/inventory/head/mob_vr_akula.dmi and b/icons/inventory/head/mob_vr_akula.dmi differ diff --git a/icons/inventory/head/mob_vr_skrell.dmi b/icons/inventory/head/mob_vr_skrell.dmi index 70d45b72af2..452b8edd0ba 100644 Binary files a/icons/inventory/head/mob_vr_skrell.dmi and b/icons/inventory/head/mob_vr_skrell.dmi differ diff --git a/icons/inventory/head/mob_vr_tajaran.dmi b/icons/inventory/head/mob_vr_tajaran.dmi index 8b430eb2744..4d37899ab39 100644 Binary files a/icons/inventory/head/mob_vr_tajaran.dmi and b/icons/inventory/head/mob_vr_tajaran.dmi differ diff --git a/icons/inventory/head/mob_vr_unathi.dmi b/icons/inventory/head/mob_vr_unathi.dmi index fd9a2904ca4..8cf2855755b 100644 Binary files a/icons/inventory/head/mob_vr_unathi.dmi and b/icons/inventory/head/mob_vr_unathi.dmi differ diff --git a/icons/inventory/head/mob_vr_vulpkanin.dmi b/icons/inventory/head/mob_vr_vulpkanin.dmi index d829c517115..7da329c30a7 100644 Binary files a/icons/inventory/head/mob_vr_vulpkanin.dmi and b/icons/inventory/head/mob_vr_vulpkanin.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index d9b40912173..ccaed21c383 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/item_skrell.dmi b/icons/inventory/suit/item_skrell.dmi index 6e7e1a49f58..07f161ec5ea 100644 Binary files a/icons/inventory/suit/item_skrell.dmi and b/icons/inventory/suit/item_skrell.dmi differ diff --git a/icons/inventory/suit/item_tajaran.dmi b/icons/inventory/suit/item_tajaran.dmi index 1b36db164d4..c75fff6abf1 100644 Binary files a/icons/inventory/suit/item_tajaran.dmi and b/icons/inventory/suit/item_tajaran.dmi differ diff --git a/icons/inventory/suit/item_unathi.dmi b/icons/inventory/suit/item_unathi.dmi index d99bc1a6830..c98b4bde97d 100644 Binary files a/icons/inventory/suit/item_unathi.dmi and b/icons/inventory/suit/item_unathi.dmi differ diff --git a/icons/inventory/suit/item_vr.dmi b/icons/inventory/suit/item_vr.dmi index e7116d9dc77..ce756444445 100644 Binary files a/icons/inventory/suit/item_vr.dmi and b/icons/inventory/suit/item_vr.dmi differ diff --git a/icons/inventory/suit/item_vr_akula.dmi b/icons/inventory/suit/item_vr_akula.dmi index 1cc43648d4b..3f7a3a150b3 100644 Binary files a/icons/inventory/suit/item_vr_akula.dmi and b/icons/inventory/suit/item_vr_akula.dmi differ diff --git a/icons/inventory/suit/item_vr_skrell.dmi b/icons/inventory/suit/item_vr_skrell.dmi index 29b1dc6c747..899e828df0f 100644 Binary files a/icons/inventory/suit/item_vr_skrell.dmi and b/icons/inventory/suit/item_vr_skrell.dmi differ diff --git a/icons/inventory/suit/item_vr_tajaran.dmi b/icons/inventory/suit/item_vr_tajaran.dmi index 29b1dc6c747..899e828df0f 100644 Binary files a/icons/inventory/suit/item_vr_tajaran.dmi and b/icons/inventory/suit/item_vr_tajaran.dmi differ diff --git a/icons/inventory/suit/item_vr_unathi.dmi b/icons/inventory/suit/item_vr_unathi.dmi index 29b1dc6c747..899e828df0f 100644 Binary files a/icons/inventory/suit/item_vr_unathi.dmi and b/icons/inventory/suit/item_vr_unathi.dmi differ diff --git a/icons/inventory/suit/item_vr_vulpkanin.dmi b/icons/inventory/suit/item_vr_vulpkanin.dmi index 6dbafa8c482..b2827957e08 100644 Binary files a/icons/inventory/suit/item_vr_vulpkanin.dmi and b/icons/inventory/suit/item_vr_vulpkanin.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index 8a3d269acd5..11d4ad28511 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/suit/mob_skrell.dmi b/icons/inventory/suit/mob_skrell.dmi index 6e369c20718..cdc768c53b2 100644 Binary files a/icons/inventory/suit/mob_skrell.dmi and b/icons/inventory/suit/mob_skrell.dmi differ diff --git a/icons/inventory/suit/mob_tajaran.dmi b/icons/inventory/suit/mob_tajaran.dmi index 0ae85bd0c41..ec4c40f709b 100644 Binary files a/icons/inventory/suit/mob_tajaran.dmi and b/icons/inventory/suit/mob_tajaran.dmi differ diff --git a/icons/inventory/suit/mob_unathi.dmi b/icons/inventory/suit/mob_unathi.dmi index 1926142454c..b549c5849ce 100644 Binary files a/icons/inventory/suit/mob_unathi.dmi and b/icons/inventory/suit/mob_unathi.dmi differ diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi index 91c916553af..ba04d1041bc 100644 Binary files a/icons/inventory/suit/mob_vr.dmi and b/icons/inventory/suit/mob_vr.dmi differ diff --git a/icons/inventory/suit/mob_vr_akula.dmi b/icons/inventory/suit/mob_vr_akula.dmi index 3de3f4b632d..ebd19e4d378 100644 Binary files a/icons/inventory/suit/mob_vr_akula.dmi and b/icons/inventory/suit/mob_vr_akula.dmi differ diff --git a/icons/inventory/suit/mob_vr_skrell.dmi b/icons/inventory/suit/mob_vr_skrell.dmi index 02832b4f2bd..bc6f654ce8f 100644 Binary files a/icons/inventory/suit/mob_vr_skrell.dmi and b/icons/inventory/suit/mob_vr_skrell.dmi differ diff --git a/icons/inventory/suit/mob_vr_tajaran.dmi b/icons/inventory/suit/mob_vr_tajaran.dmi index d409d0cf189..8c6e406990c 100644 Binary files a/icons/inventory/suit/mob_vr_tajaran.dmi and b/icons/inventory/suit/mob_vr_tajaran.dmi differ diff --git a/icons/inventory/suit/mob_vr_unathi.dmi b/icons/inventory/suit/mob_vr_unathi.dmi index a5dddccaa20..ff26fb614c6 100644 Binary files a/icons/inventory/suit/mob_vr_unathi.dmi and b/icons/inventory/suit/mob_vr_unathi.dmi differ diff --git a/icons/inventory/suit/mob_vr_vulpkanin.dmi b/icons/inventory/suit/mob_vr_vulpkanin.dmi index aa79c164a5d..df85b3297d7 100644 Binary files a/icons/inventory/suit/mob_vr_vulpkanin.dmi and b/icons/inventory/suit/mob_vr_vulpkanin.dmi differ diff --git a/icons/inventory/suit_store/mob.dmi b/icons/inventory/suit_store/mob.dmi index 3881b1c7464..da55d4f3212 100644 Binary files a/icons/inventory/suit_store/mob.dmi and b/icons/inventory/suit_store/mob.dmi differ diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi index 2bca7736c94..28987d9f771 100644 Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ diff --git a/icons/obj/tank_vr.dmi b/icons/obj/tank_vr.dmi index b239a7f168e..47cc911abcb 100644 Binary files a/icons/obj/tank_vr.dmi and b/icons/obj/tank_vr.dmi differ