From 42d027d779397225261fe91c56a0758d06819a0e Mon Sep 17 00:00:00 2001 From: Chaplain Maximum Date: Fri, 21 Jun 2024 04:58:12 +0300 Subject: [PATCH 1/3] Fixing desc and adding box --- mods/_fd/fd_assets/customs/kanaris/item.dm | 18 +++++++++++++++--- mods/_fd/fd_assets/customs/kanaris/weapon.dm | 7 +++++-- .../fd_assets/customs/kanaris/willheim.dmi | Bin 6464 -> 3063 bytes 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/mods/_fd/fd_assets/customs/kanaris/item.dm b/mods/_fd/fd_assets/customs/kanaris/item.dm index 211e4071773c5..393bd5ce47636 100644 --- a/mods/_fd/fd_assets/customs/kanaris/item.dm +++ b/mods/_fd/fd_assets/customs/kanaris/item.dm @@ -2,7 +2,7 @@ /obj/item/clothing/accessory/cloakspace/willheim name = "cloak" - desc = "." + desc = "Durable cloak from SpaceFashion. Resistant to environmental hazards and physical impact. Pleasant to the touch." icon = 'mods/_fd/fd_assets/customs/kanaris/willheim.dmi' icon_state = "kanarys_cloak" @@ -56,9 +56,9 @@ slot_r_hand_str = "syndicate-black-green" ) equip_delay = 4 SECONDS - flags_inv = HIDEGLOVES | HIDESHOES | HIDEJUMPSUIT | HIDETAIL | CLOTHING_BULKY + flags_inv = HIDESHOES | HIDETAIL | CLOTHING_BULKY | HIDEJUMPSUIT // slowdown = 1 - + valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA) body_parts_covered = ARMS | FULL_TORSO | FULL_LEGS cold_protection = ARMS | FULL_TORSO | FULL_LEGS heat_protection = ARMS | FULL_TORSO | FULL_LEGS @@ -69,3 +69,15 @@ energy = ARMOR_ENERGY_MINOR, bomb = ARMOR_BOMB_MINOR ) + +/obj/item/storage/box/willheim + name = "box" + desc = "It's just an ordinary box." + +/obj/item/storage/box/willheim/New() + ..() + new /obj/item/clothing/suit/armor/willheim(src) + new /obj/item/clothing/head/helmet/willheim(src) + new /obj/item/gun/energy/laser/lasgun/kanarys(src) + new /obj/item/cell/guncell/lasgun(src) + new /obj/item/cell/guncell/lasgun(src) diff --git a/mods/_fd/fd_assets/customs/kanaris/weapon.dm b/mods/_fd/fd_assets/customs/kanaris/weapon.dm index 4756c4d8e3643..75a374b5d43cd 100644 --- a/mods/_fd/fd_assets/customs/kanaris/weapon.dm +++ b/mods/_fd/fd_assets/customs/kanaris/weapon.dm @@ -1,7 +1,7 @@ /obj/item/gun/energy/laser/lasgun/kanarys - name = "Lasgun" - desc = "Lasgun series D-99 designed specifically for the Fleet. Known for its devastating power, almost unique for lasers." + name = "SLR-98" + desc = "The SLR-98 (Sniper Laser Rifle) is an old, somewhat outdated, laser rifle that is heavily used by pirates and bounty hunters on Kabul. It has a shabby appearance, as well as desert camouflage, which is perfect for working on a desolate and godforsaken planet in the Pirx system. s." icon = 'mods/_fd/fd_assets/customs/kanaris/willheim.dmi' icon_state = "energy-rifle-s" item_state = "rifle-scope" @@ -28,3 +28,6 @@ list(mode_name = "semiauto", burst=1, fire_delay=2, move_delay=2, accuracy=0, charge_cost=200, projectile_type = /obj/item/projectile/lasbolt), list(mode_name = "overcharge", burst=1, fire_delay=4, move_delay=6, accuracy=0, charge_cost=800, projectile_type = /obj/item/projectile/lasbolt/overcharge) ) + +/obj/item/gun/energy/laser/lasgun/kanarys/on_update_icon() + ..() diff --git a/mods/_fd/fd_assets/customs/kanaris/willheim.dmi b/mods/_fd/fd_assets/customs/kanaris/willheim.dmi index a8620d5a364a99ab575b01c60e4af50e50f9a855..cab1000cbabd5efdc3470ec4f387d654670258d3 100644 GIT binary patch literal 3063 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 literal 6464 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 From 50b7cb33190f56f17a3f1139336b9247d33a52d5 Mon Sep 17 00:00:00 2001 From: Chaplain Maximum Date: Mon, 1 Jul 2024 02:04:46 +0300 Subject: [PATCH 2/3] Update build_ruin17.dmm --- .../random_ruins/exoplanet_ruins/small_ruins/build_ruin17.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/random_ruins/exoplanet_ruins/small_ruins/build_ruin17.dmm b/maps/random_ruins/exoplanet_ruins/small_ruins/build_ruin17.dmm index 128e3ef820fa4..bfa484a658378 100644 --- a/maps/random_ruins/exoplanet_ruins/small_ruins/build_ruin17.dmm +++ b/maps/random_ruins/exoplanet_ruins/small_ruins/build_ruin17.dmm @@ -1,7 +1,7 @@ "aa" = (/obj/structure/table/woodentable/mahogany,/obj/item/device/flashlight/lamp/lava/red{pixel_y = 11},/obj/item/reagent_containers/food/drinks/glass2/coffeecup/teacup{pixel_x = 6},/obj/decal/cleanable/dirt,/obj/decal/cleanable/dirt,/turf/simulated/floor/carpet/red,/area/map_template/build/build17) "ac" = (/obj/structure/table/steel,/obj/machinery/chemical_dispenser/bar_coffee/full{dir = 1; pixel_y = -2},/obj/decal/cleanable/dirt,/obj/decal/cleanable/dirt,/turf/simulated/floor/carpet,/area/map_template/build/build17) "az" = (/obj/decal/cleanable/dirt,/obj/machinery/computer/modular/preset/library,/turf/simulated/floor/wood/walnut,/area/map_template/build/build17) -"bx" = (/obj/item/device/flashlight/lantern{flashlight_inner_range = 2; flashlight_max_bright = 0.3; flashlight_outer_range = 9; on = 1},/turf/simulated/floor/exoplanet/grass,/area/map_template/build/build17) +"bx" = (/obj/item/device/flashlight/lantern{on = 1},/turf/simulated/floor/exoplanet/grass,/area/map_template/build/build17) "bR" = (/obj/structure/flora/ausbushes/lavendergrass,/turf/simulated/floor/exoplanet/grass,/area/map_template/build/build17) "cc" = (/obj/structure/flora/ausbushes/reedbush{pixel_y = 21},/turf/simulated/floor/exoplanet/water/shallow,/area/map_template/build/build17) "cl" = (/obj/structure/bookcase,/obj/item/book/manual/materials_chemistry_analysis,/obj/item/book/random,/obj/item/book/random,/turf/simulated/floor/wood/walnut,/area/map_template/build/build17) @@ -88,7 +88,7 @@ "yF" = (/obj/structure/bed/chair/office/comfy/black,/turf/simulated/floor/wood/walnut,/area/map_template/build/build17) "yN" = (/obj/decal/cleanable/dirt,/obj/decal/cleanable/dirt,/turf/simulated/floor/exoplanet/concrete,/area/template_noop) "zC" = (/obj/decal/cleanable/dirt,/turf/simulated/floor/carpet/orange,/area/map_template/build/build17) -"zJ" = (/obj/structure/table/woodentable/mahogany,/obj/item/device/flashlight/lantern{flashlight_inner_range = 2; flashlight_max_bright = 0.3; flashlight_outer_range = 9; on = 1},/turf/simulated/floor/carpet/orange,/area/map_template/build/build17) +"zJ" = (/obj/structure/table/woodentable/mahogany,/obj/item/device/flashlight/lantern{on = 1},/turf/simulated/floor/carpet/orange,/area/map_template/build/build17) "zR" = (/obj/structure/bed/chair/comfy/black,/turf/simulated/floor/carpet/orange,/area/map_template/build/build17) "Ao" = (/obj/paint_stripe/green,/obj/landmark/damager,/turf/simulated/wall/wood,/area/map_template/build/build17) "Ap" = (/obj/structure/closet,/obj/item/hand_labeler,/obj/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/map_template/build/build17) From fa18d966d92ec269f9047a5eea0c0d0232548af9 Mon Sep 17 00:00:00 2001 From: Chaplain Maximum Date: Mon, 1 Jul 2024 02:04:51 +0300 Subject: [PATCH 3/3] Update torch3_deck3.dmm --- maps/torch_fd/torch3_deck3.dmm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/maps/torch_fd/torch3_deck3.dmm b/maps/torch_fd/torch3_deck3.dmm index 741be4f3c68d3..d1f5dd5ce4ea6 100644 --- a/maps/torch_fd/torch3_deck3.dmm +++ b/maps/torch_fd/torch3_deck3.dmm @@ -630,7 +630,7 @@ "mk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/airlock/hatch/maintenance,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/steel_ridged,/area/hallway/primary/thirddeck/fore) "ml" = (/obj/structure/flora/ausbushes/fernybush,/turf/simulated/floor/grass,/area/crew_quarters/observation) "mm" = (/obj/floor_decal/spline/fancy/wood,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/lino,/area/crew_quarters/galley) -"mn" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_coffee/full{dir = 8; layer = 2.23; pixel_y = 27},/obj/machinery/fabricator/micro/bartender{pixel_x = -3},/obj/item/sticky_pad/random{pixel_x = 7; pixel_y = 10},/turf/simulated/floor/carpet/blue,/area/crew_quarters/galley) +"mn" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_coffee/full{dir = 8; layer = 2.23; pixel_y = 27},/obj/item/sticky_pad/random{pixel_x = 7; pixel_y = 10},/obj/machinery/fabricator/micro{pixel_x = -3},/turf/simulated/floor/carpet/blue,/area/crew_quarters/galley) "mo" = (/obj/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/lino,/area/crew_quarters/galley) "mp" = (/obj/floor_decal/corner/blue/border{dir = 8},/obj/floor_decal/corner/blue/border{dir = 4},/turf/simulated/floor/tiled/dark/monotile,/area/crew_quarters/mess) "mq" = (/obj/structure/bed/sofa/r/black{dir = 8},/obj/floor_decal/corner/blue/border{dir = 8},/obj/floor_decal/corner/blue/border{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor/tiled/dark/monotile,/area/crew_quarters/mess) @@ -1229,7 +1229,6 @@ "zl" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/floor_decal/spline/fancy/wood,/obj/floor_decal/corner/grey/border{dir = 1},/turf/simulated/floor/tiled/white,/area/crew_quarters/galley) "zm" = (/obj/machinery/door/airlock/maintenance{name = "Mess Hall Maintenance"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/steel_ridged,/area/crew_quarters/mess) "zn" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/wall/r_wall/hull,/area/crew_quarters/cryolocker) -"zo" = (/obj/structure/table/woodentable_reinforced/mahogany,/obj/machinery/fabricator/micro{pixel_y = -4},/obj/machinery/door/blast/shutters{dir = 4; id_tag = "bar"; name = "Bar Shutters"},/turf/simulated/floor/wood/ebony,/area/crew_quarters/galley) "zp" = (/obj/machinery/hologram/holopad,/obj/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/crew_quarters/sleep/cryo) "zq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/wood/walnut,/area/hallway/primary/thirddeck/aft) "zr" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/structure/bed/chair/pew/mahogany,/turf/simulated/floor/tiled/dark,/area/chapel/main) @@ -2384,7 +2383,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaZNZNaMjxjyjzjAjBjCjDjEjFepjGMudvjHjIjJjIjKdvcEdxcGjLjMXZdyPIiheudydykLVivJssuIUggvjVRNjXUKTxjYdFYDfBfBfBfBRBKCKCPfWBWBxFPaWBeIXzfrsPPQjqxvxWkikjkdhAhAhAhAhAhAhAhAhAhAqdwlwlwlJFMMMMMMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaZNZNaMkukvkwkxkykzkAkBkCepxrMudvkDkEkFkGkHdvcGkIcGXkltwDwDwDwDwDwDwDOXbPlxkNkOVgYDkQTIlzAwXOjdjcYDctldldfBRBmsoHWbeLjbSUXKhxeIVelCexrChHXCFROTkZkWhAhAhAhAhAhAhAhAhAhAqdOnvexhJGOouoaIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaDiDiDivtWwWwWwWwWwWwWwWwlmujloeplpMudvdvlqlrlqdvdvlsdxcGkJbswDlululululuwDSPlwmnmoKyVgYDPODYmpMdMdMdlBZQzezezezeQTzezezeQdVFVFFsRoeIVYAecWdrZHdsnAnAnAqdhAhAhAhAhAhAhAhAhAhAqdlTlUxbNazPMMaIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaurDiYrcTfJFQuwiimMuyYrjWWwepmdepepcGffQRmemfmgmhcKcKcKmimjmkmjwDlululululuwDYxmmYxoizoVgFVSvKDADtitkPSmqXszeSxmQnxlSnmEMzeNdVFhxVJhxeIVYXMVdUpZHuhqdmxmyqdhAhAhAhAhAhAhAhAhAhAqdoAZfljUXOjuoaIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaurDiYrcTfJFQuwiimMuyYrjWWwepmdepepcGffQRmemfmgmhcKcKcKmimjmkmjwDlululululuwDYxmmYxoiKyVgFVSvKDADtitkPSmqXszeSxmQnxlSnmEMzeNdVFhxVJhxeIVYXMVdUpZHuhqdmxmyqdhAhAhAhAhAhAhAhAhAhAqdoAZfljUXOjuoaIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaurqxYrYruEnpnpnpuFYrPelXyHmSmTmUmVmjbsUymWcGcGqHcGsOZoMDmYPVnawDlululululuwDcUncndcUevBpdYnhnikaKojnKonkYDMSfUDwyQdISstTzeRWVFVcppoCeIgRYvnoArZHyDqdnlntnnhAhAhAhAhAhAhAhAhAhAqdnGmKwiNaMMMMaIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaurMTYrYruuYrYrYrGRYrYrmcyHnPnQnRnSnTnUnUnVMuMuMuUJsOoaVUocodoewDlululululuwDeQogYlYlvMwZvOWHRNLDCPvRRNwaEKWvfUoEtrrdVZEqzeOcVFhxVJYGeISLUponooZHdMqdokolomhAhAhAhAhAhAhAhAhAhAqdwlwlwlJIMMaIaIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaurmOmltYxYmRmRmRnftYYrmOnjoLoMpMpMpMpMuHuHuHuHuHuHuHoThKoUoVoWwDlululululuwDftoYpapapbpcpdpeDYpfpgjjSjpiOBzeXERFCHyloDkKzeJgWBWBZYNBeIFTMUMUpmMhdMqdpjpkFrhAhAhAhAhAhAhAhAhAhAqdwTLhWYJKSuSuSpCSSOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa