diff --git a/_maps/_mod_celadon/configs/inteq_valor.json b/_maps/_mod_celadon/configs/inteq_valor.json index 0404ca30c6b2..e2bffad0cb34 100644 --- a/_maps/_mod_celadon/configs/inteq_valor.json +++ b/_maps/_mod_celadon/configs/inteq_valor.json @@ -21,7 +21,7 @@ "slots": 1 }, "Honorable Corpsman": { - "outfit": "/datum/outfit/job/inteq/paramedic/celadon", + "outfit": "/datum/outfit/job/inteq/cmo/celadon", "officer": true, "slots": 1 }, diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm index 6d5c5030b119..f77bfd266bad 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_colossus.dmm @@ -2983,9 +2983,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2{ - dir = 1 - }, /obj/machinery/power/terminal{ dir = 4 }, @@ -2996,6 +2993,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/dark/visible/layer5, /obj/machinery/atmospherics/pipe/simple/orange/hidden/layer1, +/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/o2{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Hu" = ( @@ -3930,13 +3930,13 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/trinary/filter/atmos/o2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/dark/visible/layer5, /obj/machinery/atmospherics/pipe/simple/orange/hidden/layer1, +/obj/machinery/atmospherics/components/trinary/filter/atmos/n2, /turf/open/floor/plasteel/tech, /area/ship/engineering) "Sg" = ( diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm index 22ada23b6556..62078deec442 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_executer.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aq" = ( /obj/machinery/door/airlock/highsecurity{ - req_access = "3,20"; + req_access = "8485"; name = "Armory" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -121,7 +121,7 @@ can_be_unanchored = 1; icon_state = "warden"; name = "master at arms' locker"; - req_access_txt = "3" + req_access_txt = "8485" }, /obj/item/clothing/shoes/combat, /obj/item/megaphone/sec, @@ -858,7 +858,7 @@ pixel_x = -19; pixel_y = 9; dir = 4; - req_access_txt = "3,20" + req_access_txt = "8485" }, /obj/effect/turf_decal/industrial/traffic/fulltile, /obj/effect/turf_decal/industrial/traffic/corner{ @@ -1109,7 +1109,7 @@ pixel_x = 18; pixel_y = 9; dir = 8; - req_access_txt = "3,20" + req_access_txt = "8485" }, /obj/effect/turf_decal/industrial/traffic/corner{ dir = 4 @@ -1368,7 +1368,7 @@ can_be_unanchored = 1; icon_state = "brig_phys"; name = "equipment locker"; - req_access_txt = "1" + req_access_txt = "8484" }, /turf/open/floor/plasteel/patterned/brushed, /area/ship/medical) @@ -1432,7 +1432,7 @@ "oQ" = ( /obj/machinery/door/airlock/command{ name = "Bridge"; - req_access_txt = "20" + req_access_txt = "8486" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -2268,7 +2268,7 @@ /obj/machinery/door/airlock/command{ dir = 4; name = "Bridge"; - req_access_txt = "20" + req_access_txt = "8486" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -3187,7 +3187,7 @@ "Ob" = ( /obj/machinery/door/window/northleft{ dir = 4; - req_access_txt = "3" + req_access_txt = "8485" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -4017,7 +4017,8 @@ id = "exec_armorysh"; name = "Armory shuters"; pixel_x = 6; - pixel_y = 25 + pixel_y = 25; + req_access_txt = "8485" }, /obj/machinery/turretid{ pixel_y = 34 diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm index 2e64410f1d4e..d2ad8e25fb13 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm @@ -726,7 +726,7 @@ /obj/item/storage/belt/utility/full/engi, /obj/item/clothing/glasses/meson/engine, /obj/item/tank/internals/emergency_oxygen/double, -/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/color/yellow, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "dD" = ( @@ -7587,7 +7587,7 @@ /obj/item/clothing/glasses/meson/engine, /obj/item/tank/internals/emergency_oxygen/double, /obj/item/holosign_creator/atmos, -/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/color/yellow, /turf/open/floor/plating, /area/ship/engineering/atmospherics) "WZ" = ( diff --git a/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm b/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm index ab0482b2743d..cf94fe3e1888 100644 --- a/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm +++ b/_maps/_mod_celadon/shuttles/inteq/inteq_hound.dmm @@ -167,6 +167,11 @@ /obj/effect/turf_decal/corner_techfloor_gray{ dir = 6 }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 21; + pixel_y = 9 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "dV" = ( @@ -223,8 +228,8 @@ }, /obj/machinery/light_switch{ dir = 8; - pixel_x = 25; - pixel_y = 7 + pixel_x = 21; + pixel_y = 10 }, /turf/open/floor/plasteel/tech, /area/ship/storage/eva) @@ -376,15 +381,6 @@ "ih" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/maintenance/port) -"iw" = ( -/obj/machinery/button/door{ - id = "hound_windows"; - name = "Window Lockdown"; - pixel_x = -6; - pixel_y = 25 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) "jb" = ( /obj/structure/table, /obj/effect/turf_decal/corner/opaque/yellow, @@ -1111,13 +1107,16 @@ /turf/open/floor/plating, /area/ship/cargo) "wu" = ( -/obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/advanced_airlock_controller{ pixel_x = 25; req_access = null }, /obj/machinery/light/small/directional/south, /obj/effect/decal/cleanable/dirt, +/obj/machinery/suit_storage_unit, +/obj/item/clothing/suit/space/inteq, +/obj/item/clothing/head/helmet/space/inteq, +/obj/item/tank/internals/oxygen/yellow, /turf/open/floor/plasteel/tech/grid, /area/ship/storage/eva) "wX" = ( @@ -1407,6 +1406,11 @@ icon_state = "1-2" }, /obj/effect/turf_decal/corner_techfloor_gray/diagonal, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 21; + pixel_y = -10 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "EE" = ( @@ -2877,7 +2881,7 @@ pe HV KK BQ -iw +pe ib ib ib diff --git a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm index 02de21f9074e..f654cf062c09 100644 --- a/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm +++ b/_maps/_mod_celadon/shuttles/nanotrasen/nanotrasen_venture.dmm @@ -187,6 +187,9 @@ /obj/machinery/door/firedoor/border_only{ dir = 4 }, +/obj/item/radio/intercom/wideband/directional/south{ + pixel_x = -3 + }, /turf/open/floor/plasteel/dark, /area/ship/bridge) "pu" = ( @@ -646,7 +649,9 @@ id = "venture_front" }, /obj/docking_port/mobile{ - dir = 8 + dir = 4; + port_direction = 2; + preferred_direction = 4 }, /obj/machinery/power/shieldwallgen/atmos{ id = "venture_exit"; diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm index 88583d1990bb..4d48f3ec831d 100644 --- a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm +++ b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm @@ -191,7 +191,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, -/obj/effect/landmark/start/shaft_miner, /turf/open/floor/plasteel/tech, /area/ship/storage) "dA" = ( @@ -613,7 +612,6 @@ }, /obj/structure/chair/stool, /obj/structure/window/reinforced/tinted/frosted, -/obj/effect/landmark/start/captain, /turf/open/floor/carpet/black, /area/ship/bridge) "mL" = ( @@ -1002,7 +1000,6 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/effect/landmark/start/shaft_miner, /obj/effect/turf_decal/corner_techfloor_grid{ dir = 1 }, @@ -1062,7 +1059,6 @@ icon_state = "4-8" }, /obj/structure/chair/sofa/brown/left/directional/south, -/obj/effect/landmark/start/assistant, /turf/open/floor/carpet/red, /area/ship/crew) "rR" = ( @@ -1248,7 +1244,6 @@ /turf/open/floor/plasteel/dark, /area/ship/crew) "vi" = ( -/obj/structure/table, /obj/item/toy/cards/deck/syndicate{ pixel_y = 6 }, @@ -1261,6 +1256,7 @@ pixel_y = -1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/table, /turf/open/floor/carpet/red, /area/ship/crew) "vv" = ( @@ -1360,7 +1356,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 }, -/obj/effect/landmark/start/station_engineer, /turf/open/floor/plasteel/tech, /area/ship/storage) "xK" = ( @@ -1679,10 +1674,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) -"BG" = ( -/obj/machinery/porta_turret/ship/faction/syndicate/ballistic, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/bridge) "BR" = ( /obj/machinery/porta_turret/ship/faction/syndicate/ballistic{ dir = 1 @@ -1944,7 +1935,6 @@ /turf/open/floor/carpet/red, /area/ship/crew/dorm) "Gj" = ( -/obj/structure/chair/sofa/brown/corner/directional/east, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable{ icon_state = "0-4" @@ -1956,6 +1946,7 @@ pixel_y = 12; dir = 4 }, +/obj/structure/chair/sofa/brown/corner/directional/east, /turf/open/floor/carpet/red, /area/ship/crew) "Gm" = ( @@ -2005,7 +1996,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 }, -/obj/effect/landmark/start/chief_engineer, /turf/open/floor/carpet/red, /area/ship/cargo/office) "Ic" = ( @@ -2797,13 +2787,11 @@ /area/ship/hallway/central) "Tq" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/chair/sofa/brown/right/directional/east, -/obj/effect/landmark/start/assistant, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/newscaster/directional/west{ pixel_y = 12 }, +/obj/structure/chair/sofa/brown/right/directional/east, +/obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/carpet/red, /area/ship/crew) "Tu" = ( @@ -3369,7 +3357,7 @@ iT iT iT jt -BG +NA jI cH jI diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm index 18239e94dd7e..bbfdbab8d2aa 100644 --- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm @@ -812,7 +812,10 @@ EMPTY_GUN_HELPER(automatic/assault/hydra/dmr) /obj/item/gun/ballistic/automatic/assault/hydra/dmr/Initialize() . = ..() - magazine = new /obj/item/ammo_box/magazine/m556_42_hydra/small(src) + // [CELADON-EDIT] -- CELADON_FIXES -- фиксим неподходящий магазин (вагабага дырдырдыр) + // magazine = new /obj/item/ammo_box/magazine/m556_42_hydra/small(src) + magazine = new mag_type(src) + // [/CELADON-EDIT] chamber_round() diff --git a/icons/obj/guns/manufacturer/scarborough/48x32.dmi b/icons/obj/guns/manufacturer/scarborough/48x32.dmi index 87d4d44caeb1..d8355cc1417b 100644 Binary files a/icons/obj/guns/manufacturer/scarborough/48x32.dmi and b/icons/obj/guns/manufacturer/scarborough/48x32.dmi differ diff --git a/mod_celadon/_storge_icons/icons/riol/riol_bodypats.dmi b/mod_celadon/_storge_icons/icons/riol/riol_bodypats.dmi index 47ed955bb2b6..408b3c68e57a 100644 Binary files a/mod_celadon/_storge_icons/icons/riol/riol_bodypats.dmi and b/mod_celadon/_storge_icons/icons/riol/riol_bodypats.dmi differ diff --git a/mod_celadon/_storge_icons/icons/weapons/hands/saiga_lefthand.dmi b/mod_celadon/_storge_icons/icons/weapons/hands/saiga_lefthand.dmi new file mode 100644 index 000000000000..8e434b94d67c Binary files /dev/null and b/mod_celadon/_storge_icons/icons/weapons/hands/saiga_lefthand.dmi differ diff --git a/mod_celadon/_storge_icons/icons/weapons/hands/saiga_righthand.dmi b/mod_celadon/_storge_icons/icons/weapons/hands/saiga_righthand.dmi new file mode 100644 index 000000000000..cbd3c2968a04 Binary files /dev/null and b/mod_celadon/_storge_icons/icons/weapons/hands/saiga_righthand.dmi differ diff --git a/mod_celadon/_storge_icons/icons/weapons/obj/saiga.dmi b/mod_celadon/_storge_icons/icons/weapons/obj/saiga.dmi new file mode 100644 index 000000000000..27abec048690 Binary files /dev/null and b/mod_celadon/_storge_icons/icons/weapons/obj/saiga.dmi differ diff --git a/mod_celadon/_storge_icons/icons/weapons/obj/saiga_ammo.dmi b/mod_celadon/_storge_icons/icons/weapons/obj/saiga_ammo.dmi new file mode 100644 index 000000000000..14315527d1fa Binary files /dev/null and b/mod_celadon/_storge_icons/icons/weapons/obj/saiga_ammo.dmi differ diff --git a/mod_celadon/_storge_icons/icons/weapons/obj/saiga_bullet.dmi b/mod_celadon/_storge_icons/icons/weapons/obj/saiga_bullet.dmi new file mode 100644 index 000000000000..2965338fb778 Binary files /dev/null and b/mod_celadon/_storge_icons/icons/weapons/obj/saiga_bullet.dmi differ diff --git a/mod_celadon/_storge_icons/icons/weapons/overlay/saiga_onmob.dmi b/mod_celadon/_storge_icons/icons/weapons/overlay/saiga_onmob.dmi new file mode 100644 index 000000000000..a6a9bd83a7e7 Binary files /dev/null and b/mod_celadon/_storge_icons/icons/weapons/overlay/saiga_onmob.dmi differ diff --git a/mod_celadon/cargo_items/code/ammunition.dm b/mod_celadon/cargo_items/code/ammunition.dm index 397df3e413df..bf4e673f0b9e 100644 --- a/mod_celadon/cargo_items/code/ammunition.dm +++ b/mod_celadon/cargo_items/code/ammunition.dm @@ -9,3 +9,21 @@ desc = "A 5-round stripper clip for the SSG-669C rifle. These rounds do good damage with significant armor penetration" contains = list(/obj/item/ammo_box/a858) cost = 500 + +/datum/supply_pack/ammo/a410_buckshot + name = "410x76mm Buckshot Clip" + desc = "Дробь он же бакшот 8 металлических шаров, сняражённых в патрон, урон большой по целям в малой броне и без брони, при средних и больших показателях брони урон ниже. В коробке 75 пуль." + contains = list(/obj/item/ammo_box/a410_ammo_box) + cost = 1000 + +/datum/supply_pack/ammo/a410_slug + name = "410x76mm Slug Clip" + desc = "Жакан - пулевой патрон - slug, повышенный урон по не бронированным целям и немного пониженный по целям в броне. В коробке 65 пуль." + contains = list(/obj/item/ammo_box/a410_slug_ammo_box) + cost = 1500 + +/datum/supply_pack/ammo/a410_flechette + name = "410x76mm Flechette Clip" + desc = "Флешшет - дротик с повышенной пробиваемостью из-за своей формы, но меньшим уроном, чем пулевой патрон. В коробке 55 пуль." + contains = list(/obj/item/ammo_box/a410_flechette_ammo_box) + cost = 1500 diff --git a/mod_celadon/riol/code/species/species.dm b/mod_celadon/riol/code/species/species.dm index e4f48cd2bd45..b1e506541237 100644 --- a/mod_celadon/riol/code/species/species.dm +++ b/mod_celadon/riol/code/species/species.dm @@ -13,11 +13,7 @@ /datum/species/riol name = "\improper Riol" id = SPECIES_RIOL - loreblurb = "The Riol race is a species of feline-like bipeds hailing from the planet of Ahdomai in the \ - S'randarr system. They have been brought up into the space age by the Humans and Skrell, and have been \ - influenced heavily by their long history of Slavemaster rule. They have a structured, clan-influenced way \ - of family and politics. They prefer colder environments, and speak a variety of languages, mostly Siik'Maas, \ - using unique inflections their mouths form." + loreblurb = "Риолы - это вид гуманоидных лисиц. Риолы родом из -ДАННЫЕ УДАЛЕНЫ-, ныне проживают на частной торговой станции Мирмунвильнир, хотя их первоначальной родиной была -ДАННЫЕ УДАЛЕНЫ-, на текущий момент утеряно местонахождение." changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT diff --git a/mod_celadon/stuff_inteq/code/outfits.dm b/mod_celadon/stuff_inteq/code/outfits.dm index 6eb24b9a5824..aae43d75ffc1 100644 --- a/mod_celadon/stuff_inteq/code/outfits.dm +++ b/mod_celadon/stuff_inteq/code/outfits.dm @@ -115,6 +115,30 @@ . = ..() get_inteq_g_acces(H) +//Главный медик + +/datum/outfit/job/inteq/cmo/celadon + name = "IRMG - Honorable Corpsman" + id_assignment = "Honorable Corpsman" + jobtype = /datum/job/cmo + job_icon = "chiefmedicalofficer" + + belt = /obj/item/storage/belt/medical/webbing/paramedic + ears = /obj/item/radio/headset/inteq/captain + uniform = /obj/item/clothing/under/syndicate/inteq/corpsman + alt_uniform = /obj/item/clothing/under/syndicate/inteq/skirt/corpsman + shoes = /obj/item/clothing/shoes/combat + suit = /obj/item/clothing/suit/hooded/wintercoat/security/inteq/alt + alt_suit = /obj/item/clothing/suit/armor/inteq/corpsman + dcoat = /obj/item/clothing/suit/armor/hos/inteq + r_pocket = /obj/item/pda/medical + + chameleon_extras = null + +/datum/outfit/job/inteq/cmo/celadon/post_equip(mob/living/carbon/human/H) + . = ..() + get_inteq_g_acces(H) + //Служба безопасности /datum/outfit/job/inteq/security/celadon diff --git a/mod_celadon/weapons/_weapons.dme b/mod_celadon/weapons/_weapons.dme index e60f7bc186ed..a7b63b444a0a 100644 --- a/mod_celadon/weapons/_weapons.dme +++ b/mod_celadon/weapons/_weapons.dme @@ -3,14 +3,23 @@ #include "_weapons.dm" +#include "code/modules/projectiles/ammunition/ballistic/bullets.dm" #include "code/modules/projectiles/ammunition/ballistic/rifle.dm" +#include "code/modules/projectiles/ammunition/ballistic/shotgun.dm" + #include "code/modules/projectiles/boxes_magazines/external/rifle.dm" +#include "code/modules/projectiles/boxes_magazines/external/shotgun.dm" + #include "code/modules/projectiles/boxes_magazines/ammo_boxes.dm" + #include "code/modules/projectiles/guns/ballistic/assault.dm" +#include "code/modules/projectiles/guns/ballistic/pistol.dm" #include "code/modules/projectiles/guns/ballistic/revolver.dm" +#include "code/modules/projectiles/guns/ballistic/shotgun.dm" + #include "code/modules/projectiles/projectile/bullets/rifle.dm" -#include "code/modules/projectiles/guns/ballistic/pistol.dm" -#include "code/modules/projectiles/ammunition/ballistic/bullets.dm" +#include "code/modules/projectiles/projectile/bullets/shotgun.dm" + #include "code/ammo.dm" #include "code/gun.dm" #include "code/guncases.dm" @@ -19,4 +28,3 @@ #include "code/modules/research/all_nodes.dm" #endif - diff --git a/mod_celadon/weapons/code/gun.dm b/mod_celadon/weapons/code/gun.dm index ee183a3d92aa..89defcf8203e 100644 --- a/mod_celadon/weapons/code/gun.dm +++ b/mod_celadon/weapons/code/gun.dm @@ -74,3 +74,11 @@ contains = list(/obj/item/gun/ballistic/shotgun/automatic/combat, /obj/item/gun/ballistic/shotgun/automatic/combat) crate_name = "combat shotguns crate" + +/// Сайга-410 +/datum/supply_pack/gun/saiga + name = "Saiga-410 \"Saiga\" shotgun assault crate" + desc = "Содержит Saiga-410 и дополнительные пустые обоймы." + cost = 10850 + contains = list(/obj/item/storage/guncase/saiga) + crate_name = "auto shotgun crate" diff --git a/mod_celadon/weapons/code/guncases.dm b/mod_celadon/weapons/code/guncases.dm index f0d09a346b36..cd2e6baee0ea 100644 --- a/mod_celadon/weapons/code/guncases.dm +++ b/mod_celadon/weapons/code/guncases.dm @@ -33,3 +33,10 @@ new /obj/item/gun/ballistic/automatic/assault/morita1/swamp/no_mag(src) new /obj/item/ammo_box/magazine/morita1/drum/empty(src) new /obj/item/ammo_box/magazine/morita1/empty(src) + +/obj/item/storage/guncase/saiga +/obj/item/storage/guncase/saiga/PopulateContents() + new /obj/item/gun/ballistic/automatic/assault/saiga/no_mag(src) + new /obj/item/ammo_box/magazine/saiga/drum/empty(src) + new /obj/item/ammo_box/magazine/saiga/medium/empty(src) + new /obj/item/ammo_box/magazine/saiga/empty(src) diff --git a/mod_celadon/weapons/code/modules/projectiles/ammunition/ballistic/bullets.dm b/mod_celadon/weapons/code/modules/projectiles/ammunition/ballistic/bullets.dm index d6fd32180de4..4d3227bfd091 100644 --- a/mod_celadon/weapons/code/modules/projectiles/ammunition/ballistic/bullets.dm +++ b/mod_celadon/weapons/code/modules/projectiles/ammunition/ballistic/bullets.dm @@ -2,3 +2,28 @@ name = "5.56x39mm bullet" damage = 25 armour_penetration = 20 + +/obj/projectile/bullet/flechette + ///How much damage is subtracted per tile? + var/tile_dropoff = 1 //Standard of 10% per tile + ///How much stamina damage is subtracted per tile? + var/tile_dropoff_stamina = 1.5 //As above + + icon_state = "pellet" + armour_penetration = -35 + speed = 0.5 + +/obj/projectile/bullet/flechette + name = "12g shotgun flechette" + damage = 40 + armour_penetration = -10 + speed = 0.5 + +/obj/projectile/bullet/flechette/Range() //10% loss per tile = max range of 10, generally + ..() + if(damage > 0) + damage -= tile_dropoff + if(stamina > 0) + stamina -= tile_dropoff_stamina + if(damage < 0 && stamina < 0) + qdel(src) diff --git a/mod_celadon/weapons/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/mod_celadon/weapons/code/modules/projectiles/ammunition/ballistic/shotgun.dm new file mode 100644 index 000000000000..db4af4a838c0 --- /dev/null +++ b/mod_celadon/weapons/code/modules/projectiles/ammunition/ballistic/shotgun.dm @@ -0,0 +1,27 @@ +// 410mm (Saiga) +/obj/item/ammo_casing/a410 + name = "410mm buckshot casing" + desc = "Дробь он же бакшот 8 металлических шаров, сняражённых в патрон, урон большой по целям в малой броне и без брони, при средних и больших показателях брони урон ниже. В коробке 75 пуль." + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_bullet.dmi' + icon_state = "backshot_410" + caliber = "410x76mm" + projectile_type = /obj/projectile/bullet/pellet/a410 + bullet_per_box = 75 + +/obj/item/ammo_casing/a410/a410_slug + name = "410mm bullet casing" + desc = "Жакан - пулевой патрон - slug, повышенный урон по не бронированным целям и немного пониженный по целям в броне. В коробке 65 пуль." + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_bullet.dmi' + icon_state = "slug_410" + caliber = "410x76mm" + projectile_type = /obj/projectile/bullet/slug/a410 + bullet_per_box = 65 + +/obj/item/ammo_casing/a410/a410_flechette + name = "410mm bullet casing" + desc = "Флешшет - дротик с повышенной пробиваемостью из-за своей формы, но меньшим уроном, чем пулевой патрон. В коробке 55 пуль." + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_bullet.dmi' + icon_state = "flechette_410" + caliber = "410x76mm" + projectile_type = /obj/projectile/bullet/flechette/a410 + bullet_per_box = 55 diff --git a/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index e0eb6359eedb..494b189bfbd5 100644 --- a/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -91,3 +91,31 @@ icon_state = "a858box" ammo_type = /obj/item/ammo_casing/caseless/a858 max_ammo = 50 + +// +// 410x76mm +// +/obj/item/ammo_box/a410_ammo_box + name = "Ammo box (410x76mm buckshot)" + desc = "Дробь он же бакшот 8 металлических шаров, сняражённых в патрон, урон большой по целям в малой броне и без брони, при средних и больших показателях брони урон ниже. В коробке 75 пуль." + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_ammo.dmi' + icon_state = "410box_buckshot" + ammo_type = /obj/item/ammo_casing/a410 + max_ammo = 75 + +/obj/item/ammo_box/a410_slug_ammo_box + name = "Ammo box (410x76mm slug)" + desc = "Жакан - пулевой патрон - slug, повышенный урон по не бронированным целям и немного пониженный по целям в броне. В коробке 65 пуль." + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_ammo.dmi' + icon_state = "410box_slug" + ammo_type = /obj/item/ammo_casing/a410/a410_slug + max_ammo = 65 + +/obj/item/ammo_box/a410_flechette_ammo_box + name = "Ammo box (410x76mm flechette)" + desc = "Флешшет - дротик с повышенной пробиваемостью из-за своей формы, но меньшим уроном, чем пулевой патрон. В коробке 55 пуль." + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_ammo.dmi' + icon_state = "410box_flechette" + ammo_type = /obj/item/ammo_casing/a410/a410_flechette + max_ammo = 55 + diff --git a/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/external/shotgun.dm new file mode 100644 index 000000000000..93f4a63cb5e5 --- /dev/null +++ b/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/external/shotgun.dm @@ -0,0 +1,110 @@ +/obj/item/ammo_box/magazine/saiga + name = "\improper saiga 6 bullet magazine (410x76mm buckshot)" + desc = "A simple saiga magazine designed to chamber 410x76mm." + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_ammo.dmi' + icon_state = "6_bullet-1" + base_icon_state = "6_bullet" + caliber = "410x76mm" + ammo_type = /obj/item/ammo_casing/a410 + max_ammo = 6 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/saiga/slug + name = "shotgun magazine (12g slugs)" + icon_state = "6_bullet_slug-1" + ammo_type = /obj/item/ammo_casing/a410/a410_slug + +/obj/item/ammo_box/magazine/saiga/flechette + name = "shotgun magazine (12g flechette)" + icon_state = "6_bullet_flechette-1" + ammo_type = /obj/item/ammo_casing/a410/a410_flechette + +/obj/item/ammo_box/magazine/saiga/update_icon_state() + . = ..() + icon_state = "6_bullet-[!!ammo_count()]" + +/obj/item/ammo_box/magazine/saiga/slug/update_icon_state() + . = ..() + icon_state = "6_bullet_slug-[!!ammo_count()]" + +/obj/item/ammo_box/magazine/saiga/flechette/update_icon_state() + . = ..() + icon_state = "6_bullet_flechette-[!!ammo_count()]" + +/obj/item/ammo_box/magazine/saiga/empty + start_empty = TRUE + + +/obj/item/ammo_box/magazine/saiga/medium + name = "\improper saiga 9 bullet magazine (410x76mm buckshot)" + desc = "A simple saiga magazine designed to chamber 410x76mm." + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_ammo.dmi' + icon_state = "9_bullet-1" + base_icon_state = "9_bullet" + ammo_type = /obj/item/ammo_casing/a410 + max_ammo = 9 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/saiga/medium/slug + name = "shotgun medium magazine (12g slugs)" + icon_state = "9_bullet_slug-1" + ammo_type = /obj/item/ammo_casing/a410/a410_slug + +/obj/item/ammo_box/magazine/saiga/medium/flechette + name = "shotgun medium magazine (12g flechette)" + icon_state = "9_bullet_flechette-1" + ammo_type = /obj/item/ammo_casing/a410/a410_flechette + +/obj/item/ammo_box/magazine/saiga/medium/update_icon_state() + . = ..() + icon_state = "9_bullet-[!!ammo_count()]" + +/obj/item/ammo_box/magazine/saiga/medium/slug/update_icon_state() + . = ..() + icon_state = "9_bullet_slug-[!!ammo_count()]" + +/obj/item/ammo_box/magazine/saiga/medium/flechette/update_icon_state() + . = ..() + icon_state = "9_bullet_flechette-[!!ammo_count()]" + +/obj/item/ammo_box/magazine/saiga/medium/empty + start_empty = TRUE + + +/obj/item/ammo_box/magazine/saiga/drum + name = "\improper saiga 14 bullet magazine (410x76mm buckshot)" + desc = "A simple saiga magazine designed to chamber 410x76mm." + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga_ammo.dmi' + icon_state = "drum-1" + base_icon_state = "drum" + ammo_type = /obj/item/ammo_casing/a410 + max_ammo = 14 + w_class = WEIGHT_CLASS_NORMAL + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/ammo_box/magazine/saiga/drum/slug + name = "shotgun drum magazine (12g slugs)" + icon_state = "drum_slug-1" + ammo_type = /obj/item/ammo_casing/a410/a410_slug + +/obj/item/ammo_box/magazine/saiga/drum/flechette + name = "shotgun drum magazine (12g flechette)" + icon_state = "drum_flechette-1" + ammo_type = /obj/item/ammo_casing/a410/a410_flechette + +/obj/item/ammo_box/magazine/saiga/drum/update_icon_state() + . = ..() + icon_state = "drum-[!!ammo_count()]" + +/obj/item/ammo_box/magazine/saiga/drum/slug/update_icon_state() + . = ..() + icon_state = "drum_slug-[!!ammo_count()]" + +/obj/item/ammo_box/magazine/saiga/drum/flechette/update_icon_state() + . = ..() + icon_state = "drum_flechette-[!!ammo_count()]" + +/obj/item/ammo_box/magazine/saiga/drum/empty + start_empty = TRUE + +// EMPTY_GUN_HELPER(shotgun/saiga) diff --git a/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/shotgun.dm b/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/shotgun.dm new file mode 100644 index 000000000000..f8dc6098dbce --- /dev/null +++ b/mod_celadon/weapons/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -0,0 +1,53 @@ +/obj/item/gun/ballistic/automatic/assault/saiga + name = "Saiga-410 \"Saiga\"" + desc = "Cамозарядный гладкоствольный карабин, разработанный на Ижевском машиностроительном заводе на базе автомата Калашникова. Предназначен для промысловой и любительской охоты на мелкого и среднего зверя и птицу, может использоваться в качестве спортивно-тренировочного оружия. Калибр 410х76mm." + icon = 'mod_celadon/_storge_icons/icons/weapons/obj/saiga.dmi' + lefthand_file = 'mod_celadon/_storge_icons/icons/weapons/hands/saiga_lefthand.dmi' + righthand_file = 'mod_celadon/_storge_icons/icons/weapons/hands/saiga_righthand.dmi' + mob_overlay_icon = 'mod_celadon/_storge_icons/icons/weapons/overlay/saiga_onmob.dmi' + icon_state = "saiga" + item_state = "saiga" + + weapon_weight = WEAPON_HEAVY + slot_flags = ITEM_SLOT_BACK + mag_type = /obj/item/ammo_box/magazine/saiga + fire_sound = 'sound/weapons/gun/shotgun/bulldog.ogg' + show_magazine_on_sprite = TRUE + show_ammo_capacity_on_magazine_sprite = FALSE + internal_magazine = FALSE + casing_ejector = TRUE + tac_reloads = TRUE + pickup_sound = 'sound/items/handling/rifle_pickup.ogg' + manufacturer = MANUFACTURER_SCARBOROUGH + + w_class = WEIGHT_CLASS_BULKY + + gun_firenames = list(FIREMODE_SEMIAUTO = "matter semi-auto", FIREMODE_FULLAUTO = "matter full auto") + gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO) + semi_auto = TRUE + vary_fire_sound = FALSE + suppressed_sound = 'sound/weapons/gun/smg/shot_suppressed.ogg' + + load_sound = 'sound/weapons/gun/rifle/ar_reload.ogg' + load_empty_sound = 'sound/weapons/gun/rifle/ar_reload.ogg' + eject_sound = 'sound/weapons/gun/rifle/ar_unload.ogg' + eject_empty_sound = 'sound/weapons/gun/rifle/ar_unload.ogg' + + rack_sound = 'sound/weapons/gun/rifle/ar_cock.ogg' + + wield_delay = 1 SECONDS + fire_delay = 0.4 SECONDS // this NEEDS the old delay. + spread = 4 + spread_unwielded = 16 + recoil = 1 + recoil_unwielded = 4 + wield_slowdown = 0.6 + wield_delay = 0.65 SECONDS + +/obj/item/gun/ballistic/automatic/assault/saiga/Initialize() + . = ..() + +/obj/item/gun/ballistic/automatic/assault/saiga/no_mag + spawnwithmagazine = FALSE + +EMPTY_GUN_HELPER(automatic/assault/saiga) diff --git a/mod_celadon/weapons/code/modules/projectiles/projectile/bullets/shotgun.dm b/mod_celadon/weapons/code/modules/projectiles/projectile/bullets/shotgun.dm new file mode 100644 index 000000000000..33ce88f22da5 --- /dev/null +++ b/mod_celadon/weapons/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -0,0 +1,22 @@ +// 410х76mm + +/obj/projectile/bullet/pellet/a410 + name = "rubbershot pellet" + icon = 'mod_celadon/_storge_icons/icons/ammo/projectiles.dmi' + icon_state = "pellet" + damage = 15 + armour_penetration = -35 + +/obj/projectile/bullet/slug/a410 + name = "12g shotgun slug" + icon = 'mod_celadon/_storge_icons/icons/ammo/projectiles.dmi' + icon_state = "bullet" + damage = 70 + armour_penetration = -20 + +/obj/projectile/bullet/flechette/a410 + name = "flechette" + icon = 'mod_celadon/_storge_icons/icons/ammo/projectiles.dmi' + icon_state = "rubber" + damage = 50 + armour_penetration = 25