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) 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 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 a8620d5a364a9..cab1000cbabd5 100644 Binary files a/mods/_fd/fd_assets/customs/kanaris/willheim.dmi and b/mods/_fd/fd_assets/customs/kanaris/willheim.dmi differ