diff --git a/code/datums/supplypacks/voidsuits_vr.dm b/code/datums/supplypacks/voidsuits_vr.dm index 37cd0563c4..fc915527f6 100644 --- a/code/datums/supplypacks/voidsuits_vr.dm +++ b/code/datums/supplypacks/voidsuits_vr.dm @@ -140,5 +140,19 @@ containertype = /obj/structure/closet/crate/secure name = "Solgov captain voidsuit crate" access = access_captain +<<<<<<< HEAD // CHOMPStation EDIT End +======= + +/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" +>>>>>>> 3596f94516... Merge pull request #14842 from KillianKirilenko/kk-coyotesuit diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 3f0ed8893c..8bb5bb465b 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 ca48bfcfe1..f543aa48c6 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 2b311c0a24..ce764ee6c5 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 c06fc667db..1957895c8c 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 6aeead5a24..c184d1888d 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 86844d8526..170b02f6b7 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 b649db2403..ea142cde28 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 96ae1725cd..1a7192761e 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 a60948269e..216a518951 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 cf2ea23141..412f2081bf 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 9a23e59f20..f1accb8914 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 2223bafae4..7b5aaa600f 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 2223bafae4..7b5aaa600f 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 c3be906c44..455c19c0a9 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 2974d0d883..aded629d43 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 ab3267b937..b259b37571 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 857a158696..ff0332205c 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 d78cf385aa..2030158624 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 90aba59462..b182d2c1c1 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 6ea289d7f7..18f39e6736 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 70d45b72af..452b8edd0b 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 8b430eb274..4d37899ab3 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 fd9a2904ca..8cf2855755 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 d829c51711..7da329c30a 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 d9b4091217..ccaed21c38 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 6e7e1a49f5..07f161ec5e 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 1b36db164d..c75fff6abf 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 d99bc1a683..c98b4bde97 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 e7116d9dc7..ce75644444 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 1cc43648d4..3f7a3a150b 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 29b1dc6c74..899e828df0 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 29b1dc6c74..899e828df0 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 29b1dc6c74..899e828df0 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 6dbafa8c48..b2827957e0 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 8a3d269acd..11d4ad2851 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 6e369c2071..cdc768c53b 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 0ae85bd0c4..ec4c40f709 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 1926142454..b549c5849c 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 91c916553a..ba04d1041b 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 3de3f4b632..ebd19e4d37 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 02832b4f2b..bc6f654ce8 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 d409d0cf18..8c6e406990 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 a5dddccaa2..ff26fb614c 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 aa79c164a5..df85b3297d 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 3881b1c746..da55d4f321 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 2bca7736c9..28987d9f77 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 b239a7f168..47cc911abc 100644 Binary files a/icons/obj/tank_vr.dmi and b/icons/obj/tank_vr.dmi differ