diff --git a/code/modules/clothing/spacesuits/rig/suits/alien_ch.dm b/code/modules/clothing/spacesuits/rig/suits/alien_ch.dm index c06d651d82..4c824f6a57 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien_ch.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien_ch.dm @@ -5,6 +5,7 @@ name = "nanosuit control cluster" suit_type = "nanomachine" icon = 'icons/obj/rig_modules_ch.dmi' + default_mob_icon = 'icons/mob/rig_back_ch.dmi' icon_state = "nanomachine_rig" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 90) siemens_coefficient= 0.5 diff --git a/code/modules/clothing/spacesuits/rig/suits/station_ch.dm b/code/modules/clothing/spacesuits/rig/suits/station_ch.dm index 89945e0dfb..7f689ac86e 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station_ch.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station_ch.dm @@ -1,6 +1,7 @@ //Hardsuits /obj/item/weapon/rig/ch //Some blank bs desc = "This is a dev item and should not be spawned." + default_mob_icon = 'icons/mob/rig_back_ch.dmi' chest_type = /obj/item/clothing/suit/space/rig/ch helm_type = /obj/item/clothing/head/helmet/space/rig/ch glove_type = /obj/item/clothing/gloves/gauntlets/rig/ch @@ -23,9 +24,10 @@ //A second security suit. Comes with a grenade launcher that only accepts flashbangs and adds a new sprinter and flash modules. /obj/item/weapon/rig/ch/pursuit name = "pursuit hardsuit control module" + icon = 'icons/obj/rig_modules_ch.dmi' + icon_state = "pursuit_rig" suit_type = "pursuit hardsuit" desc = "A Security hardsuit designed for chasing down the grey tide." - icon_state = "pursuit_rig" armor = list(melee = 60, bullet = 40, laser = 40, energy = 25, bomb = 50, bio = 100, rad = 30) slowdown = 1 offline_slowdown = 3 @@ -45,7 +47,7 @@ req_access = list(access_hos) req_one_access = list() -/obj/item/weapon/rig/pursuit/equipped +/obj/item/weapon/rig/ch/pursuit/equipped initial_modules = list( /obj/item/rig_module/maneuvering_jets, diff --git a/icons/mob/rig_back.dmi b/icons/mob/rig_back.dmi index 826dfdb447..d3402980d7 100644 Binary files a/icons/mob/rig_back.dmi and b/icons/mob/rig_back.dmi differ diff --git a/icons/mob/rig_back_ch.dmi b/icons/mob/rig_back_ch.dmi new file mode 100644 index 0000000000..783f2303c8 Binary files /dev/null and b/icons/mob/rig_back_ch.dmi differ diff --git a/icons/obj/rig_modules_ch.dmi b/icons/obj/rig_modules_ch.dmi index 24de8390d9..eaede87b38 100644 Binary files a/icons/obj/rig_modules_ch.dmi and b/icons/obj/rig_modules_ch.dmi differ diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm index f7acc3c559..35d5df7635 100644 --- a/maps/southern_cross/southern_cross-2.dmm +++ b/maps/southern_cross/southern_cross-2.dmm @@ -46,6 +46,7 @@ "aaT" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/red/border{dir = 8},/turf/simulated/floor/tiled,/area/security/prison) "aaU" = (/obj/machinery/seed_storage/garden{dir = 8},/obj/machinery/ai_status_display{pixel_x = 32},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/turf/simulated/floor/tiled,/area/security/prison) "aaV" = (/obj/machinery/door/airlock{name = "Toilet"},/turf/simulated/floor/tiled/freezer,/area/security/prison) +"aaW" = (/obj/machinery/status_display{pixel_x = 32; pixel_y = -32},/obj/structure/extinguisher_cabinet{pixel_y = -30},/obj/effect/floor_decal/borderfloorblack{dir = 6},/obj/effect/floor_decal/corner/blue/border{dir = 6},/obj/structure/closet/secure_closet/hos2,/obj/item/weapon/cell/device,/obj/item/device/holowarrant,/obj/item/weapon/rig/ch/pursuit/equipped,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/sc/hos) "aaX" = (/obj/structure/table/rack{dir = 8; layer = 2.6},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/corner/blue{dir = 9},/obj/item/clothing/gloves/arm_guard/laserproof,/obj/item/clothing/shoes/leg_guard/laserproof,/obj/item/clothing/suit/armor/laserproof,/obj/item/clothing/head/helmet/laserproof,/obj/machinery/door/window/brigdoor/eastright{name = "Laser Armor"},/turf/simulated/floor/tiled/dark,/area/security/armoury) "aaY" = (/obj/machinery/camera/network/security{c_tag = "SEC - Armory"; dir = 1},/obj/machinery/door/firedoor/glass,/turf/simulated/floor/tiled/techmaint,/area/security/armoury) "aaZ" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/empslite{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/flashbangs{pixel_x = -2; pixel_y = -2},/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/dark,/area/security/armoury) @@ -506,7 +507,6 @@ "ajM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/valve/digital{dir = 4; name = "CO2 Outlet Valve"},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/camera/network/engineering{c_tag = "ENG - Atmospherics Fore Port"; dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos) "ajN" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "CO2 to Mixing"},/turf/simulated/floor/tiled,/area/engineering/atmos) "ajO" = (/obj/machinery/atmospherics/pipe/manifold4w/visible/green,/obj/machinery/meter,/turf/simulated/floor/tiled,/area/engineering/atmos) -"ajP" = (/obj/machinery/status_display{pixel_x = 32; pixel_y = -32},/obj/structure/extinguisher_cabinet{pixel_y = -30},/obj/effect/floor_decal/borderfloorblack{dir = 6},/obj/effect/floor_decal/corner/blue/border{dir = 6},/obj/structure/closet/secure_closet/hos2,/obj/item/weapon/cell/device,/obj/item/device/holowarrant,/obj/item/weapon/rig/ch/pursuit,/turf/simulated/floor/tiled/dark,/area/crew_quarters/heads/sc/hos) "ajQ" = (/obj/machinery/atmospherics/pipe/simple/visible/green{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/red,/turf/simulated/floor/tiled,/area/engineering/atmos) "ajR" = (/obj/machinery/atmospherics/pipe/manifold/visible/green,/obj/machinery/meter,/turf/simulated/floor/tiled,/area/engineering/atmos) "ajS" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan,/obj/machinery/atmospherics/pipe/simple/visible/green{dir = 4},/turf/simulated/floor/tiled,/area/engineering/atmos) @@ -7256,7 +7256,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaafaafaafaeHajGaioajHajIajKajLajMajNajOajQahQahQahQahQahQajRahQahQahQajOajSahwahQajTajUajVajWaaaaafaagaafaagaafaafaafaTKaLyaLyaLyaGGaFaaFbaFcaLIaFeaIlaFgaFhaFiaJOaIpaFlajXaFmaFnaFoaFpaFqaFrajYaFsaFtaFuajZaFvnJhakaakbaFwaFxaIzakcaKfaIBaFBaKeakdaICakeakfaFDsvXaFFaFGaHiaafaafaafaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGgaZLaGgaaaaaaaafaaaaaaaaaaafaaaaaaaGgaUwaGgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaeHaeHaeHaeHaeHaaaakgakhakAahqahtaTvaTvakEakFaYCakGakHakJakKagYaWHahtaTvaPHakLakLagbaaaaaaaagaaaaaaaaaaaaaaaaTKaGCakMaGDaGGaGGaGFaGGaLIaGIaGJakNaGKakOaGLaGMaGNaGOaGPaGQaGRaGSaGTaGUakPaGVaGTaGWaiTaGXaGYakQtkHakRaGZaIzsFMaHbaKeakSaKeaHdaICakTaHeaHiaHiaHiaHiaHiaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaZLaafaafaafaafaaaaaaaaaaafaafaafaafaUwaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaafaaaaafaaaaaaaYyakUaTvahqaRCaTvaTvaTvaTvakVaTvakWakXakXakYakZalbalcalqaltaltaYyaaaaaaaafaaaaaaaaaaaaaaaaTKaTKaIdaIealuaIfaIgaLyaLIaIjaIkaIlalvaImaJOaIoaIpdJJaIqaLIaIraIsaItalxalyaIuaIvaIwalzaLQalAaIxalBalCajEaIzalDaIAalEalFaIBalGaICalIaIDalJaIEalKalLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaZLaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaUwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaactaafaafaafaeHaeHaeHaeHaeHaaaaYyakUaTvahqaRCaTvaTvalMalMalNaTvalOalPalSaPHaWHaRCakEaTvamuamuaYyaaaaaaaafaaaaaacFUaaaaaaaaaaLsaLtaJDaFbaJEamvaLyaJGaJHaJIaJJaJKaJLaJOaJNaJOaJPaJQaLIaLPaLPaLPaJVamwaJWaLPaJYaLPaLQamxamyamzamAajPaIzaKcaKdaKeamBaKfaKgaICamCamDamEaKhamFalLaaaaaaaaacFUqlFaaaaaaaaaaaaaaaaafhqqaagaagaagaagaagqlFcAwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaZLaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaUwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaactaafaafaafaeHaeHaeHaeHaeHaaaaYyakUaTvahqaRCaTvaTvalMalMalNaTvalOalPalSaPHaWHaRCakEaTvamuamuaYyaaaaaaaafaaaaaacFUaaaaaaaaaaLsaLtaJDaFbaJEamvaLyaJGaJHaJIaJJaJKaJLaJOaJNaJOaJPaJQaLIaLPaLPaLPaJVamwaJWaLPaJYaLPaLQamxamyamzamAaaWaIzaKcaKdaKeamBaKfaKgaICamCamDamEaKhamFalLaaaaaaaaacFUqlFaaaaaaaaaaaaaaaaafhqqaagaagaagaagaagqlFcAwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaZLaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaUwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacFUaaaaeHamGamHamIaiqairaisamJaiuamKamLaTvaTvamNamOalNaTvamPahpagYaPHaWHaRCaTvamQaMTaMTaMTaMTaMTaafaaaaaaaaaaaaaaaaaaaLsaLtaLuaLvaLwaLxaLyaLIaiRaLBaLCamRaLDaLEaLFaLGaLHanAaLIaLJaLPaLOaLManBaLNaLOanCaLPanEaLQaLQaLQaLQaLQaIzaLRanFaLSanGanHanIaICanJaLTanKanLanLalLaaaaaaaaaaaaaagaaaaaaaaaaaaaafaafaaaaafaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaZLaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaUwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqlFaaaaaaaaaaeHanMamHanNajIajKajLanOanPanQaRCaTvalOalcalcanRanSaMRanTaMRalqaWHaRCaTvanUaMTaMSanWanXaMTaRNaIaaIaaMVaMVaMWaTKaMYaMZaNaanYaNbberberberberberberberberberberberberberberberberaNqaNraNsaNsaNtaozaoBaoBaoGaoHaoIaoJaNuaICaNvaNwaNxaNvaNvaICaICaoKaoLaoMaoOaoPaSqaSqaafaafaafaagaaaaaaaaaaafaafaaaaaaaafaaaaaaaafaaaaaaaaaaaacFUaaaaaaaaaaaaaaaaaaaaaaaaaaaaZLaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaUwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaafaafaafaeHaeHaeHaeHaeHaaaakgaoQakAaTvahtaTvaPHaTvaTvagYaTvamPaTvagYaTvaOraOsaOtaOuaoRaOvaOwaOxaOyaOzaOAaIaaIaaZLaOBaOCaODaOEaOFaoSaOGaTTaOIaOJaoTaoUaOKaoVaOLaOMaONaOOaOPaoWaoXaOQaORaOSaShapcaOUaOVaOWaOXaOYapyaOZaPaapzpmJbrzaPbaPcapCapDapEapFapGapIapJaQvapKapLapNapOaaaaaaaaahqqaagaagaagqlFcFUaaaaaaaafaaaaaaaafaaaaafaafapRaafaafaaaaaaaaacAwaaaaaaaaaaaaaZLaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaUwaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa