From ca951872d34e1e94303f310536c477c39827288c Mon Sep 17 00:00:00 2001 From: Risko <161726224+RichardRisk@users.noreply.github.com> Date: Sat, 2 Mar 2024 18:05:44 +0100 Subject: [PATCH] Gunact MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Vendor sprzedający rewolwery do samoobrony --- _maps/map_files/Atlas/atlas.dmm | 1 + _maps/map_files/generic/CentCom.dmm | 12 +++++-- aquila/aquila.dm | 4 +++ .../boxes_magazines/internal/revolver.dm | 5 +++ .../projectiles/guns/ballistic/revolver.dm | 16 +++++++++ aquila/code/modules/vending/gunact.dm | 31 ++++++++++++++++++ aquila/icons/obj/vending.dmi | Bin 0 -> 1028 bytes .../projectile/bullets/revolver.dm | 2 +- 8 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 aquila/code/modules/projectiles/boxes_magazines/internal/revolver.dm create mode 100644 aquila/code/modules/projectiles/guns/ballistic/revolver.dm create mode 100644 aquila/code/modules/vending/gunact.dm create mode 100644 aquila/icons/obj/vending.dmi diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index 15a0f6b3f9e..47c71a32198 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -17483,6 +17483,7 @@ /obj/effect/turf_decal/tile/ship/red{ dir = 4 }, +/obj/machinery/vending/gunact, /turf/open/floor/durasteel/alt, /area/hallway/nsv/deck2/primary) "XY" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index d78d734e3dd..5c5e1f5760a 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -196,6 +196,14 @@ }, /turf/open/floor/monotile/dark, /area/centcom/evac) +"ck" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/vending/cigarette, +/turf/open/floor/plasteel, +/area/tdome/tdomeobserve) "co" = ( /obj/structure/table, /obj/item/flashlight/lamp{ @@ -12692,7 +12700,6 @@ /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) "GT" = ( -/obj/machinery/vending/cigarette, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -12703,6 +12710,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/machinery/vending/gunact, /turf/open/floor/plasteel/dark, /area/tdome/tdomeobserve) "GU" = ( @@ -62713,7 +62721,7 @@ Fp Gp Ep GQ -Hf +ck Hu Gx GM diff --git a/aquila/aquila.dm b/aquila/aquila.dm index f6561f5b558..28327abfaa3 100644 --- a/aquila/aquila.dm +++ b/aquila/aquila.dm @@ -193,9 +193,11 @@ #include "code\modules\power\energyharvester.dm" #include "code\modules\power\generator.dm" #include "code\modules\power\smes.dm" +#include "code\modules\projectiles\guns\ballistic\revolver.dm" #include "code\modules\projectiles\guns\energy\energy.dm" #include "code\modules\projectiles\guns\energy\laser.dm" #include "code\modules\projectiles\guns\energy\pulse.dm" +#include "code\modules\projectiles\boxes_magazines\internal\revolver.dm" #include "code\modules\reagents\chemistry\reagents\alcohol_reagents.dm" #include "code\modules\reagents\chemistry\reagents\other_reagents.dm" #include "code\modules\requests\request.dm" @@ -230,8 +232,10 @@ #include "code\modules\uplink\uplink_items.dm" #include "code\modules\vending\boozeomat.dm" #include "code\modules\vending\cola.dm" +#include "code\modules\vending\gunact.dm" #include "code\modules\vending\wardrobes.dm" #include "code\modules\projectiles\boxes_magazines\internal\shotgun.dm" #include "code\modules\research\designs\mecha_designs.dm" #include "code\modules\reagents\chemistry\recipes\other_reagents.dm" #include "code\modules\reagents\reagent_containers\bottle.dm" + diff --git a/aquila/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/aquila/code/modules/projectiles/boxes_magazines/internal/revolver.dm new file mode 100644 index 00000000000..f96bf67c757 --- /dev/null +++ b/aquila/code/modules/projectiles/boxes_magazines/internal/revolver.dm @@ -0,0 +1,5 @@ +/obj/item/ammo_box/magazine/internal/cylindercsa + name = "revolver sa cylinder" // cylinder Colt Single Action + ammo_type = /obj/item/ammo_casing/c45 + caliber = ".45" + max_ammo = 5 diff --git a/aquila/code/modules/projectiles/guns/ballistic/revolver.dm b/aquila/code/modules/projectiles/guns/ballistic/revolver.dm new file mode 100644 index 00000000000..447083ae9cb --- /dev/null +++ b/aquila/code/modules/projectiles/guns/ballistic/revolver.dm @@ -0,0 +1,16 @@ +/obj/item/gun/ballistic/revolver/coltsingleaction + name = "Colt Single Action" //broń dostepna w automacie z rewolwerami + desc = "Revolver uses .45 ammo." + icon_state = "detective_peacemaker" + mag_type = /obj/item/ammo_box/magazine/internal/cylindercsa + fire_rate = 1.5 // szybkostrzelnosc do moderowania + + + +/obj/item/gun/ballistic/revolver/detective/special + name = "Special 38" //broń dostepna w automacie z rewolwerami + desc = "A classic, if not outdated firearm. Uses .38-special rounds." + fire_sound = 'sound/weapons/revolver38shot.ogg' + icon_state = "detective_stainless" + fire_rate = 2 // szybkostrzelnosc do moderowania, taka sama jak w colt detective + mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38 diff --git a/aquila/code/modules/vending/gunact.dm b/aquila/code/modules/vending/gunact.dm new file mode 100644 index 00000000000..f4c6222add2 --- /dev/null +++ b/aquila/code/modules/vending/gunact.dm @@ -0,0 +1,31 @@ +/obj/machinery/vending/gunact //alpha test gunact wersja 0.1 + name = "GunSzop!" + desc = "Twój oldskulowy sklep ze wszystkim, co dotyczy samoobrony!;Bądź patriotą już dziś, kup broń!;Wysokiej jakości broń za niską cenę!" + icon = 'aquila/icons/obj/vending.dmi' + icon_state = "gunact" + product_slogans = "Wyraź swoją wolność już dziś!;Broń nie zabija, ludzie tak!;Kto potrzebuje obowiązków, kiedy masz broń?" + product_ads = "Wolność kocham i rozumiem, wolności oddac nie umiem" + vend_reply = "Zapamiętaj nazwę: GunSzop!" + light_color = LIGHT_COLOR_YELLOW + + //Piwo i amunicja do rewolwerow + products = list(/obj/item/reagent_containers/food/drinks/beer/light = 6, + /obj/item/ammo_casing/n762 = 7, + /obj/item/ammo_casing/c38 = 6, + /obj/item/ammo_casing/c45 = 5) + + + //Premium rewolwery i stary kapelusz + premium = list(/obj/item/gun/ballistic/revolver/nagant = 1, + /obj/item/gun/ballistic/revolver/detective/special = 1, + /obj/item/gun/ballistic/revolver/coltsingleaction = 1, + /obj/item/clothing/head/oldhat = 1) + + //Kontrabanda + contraband = list(/obj/item/clothing/under/misc/patriotsuit = 1, + /obj/item/bedsheet/patriot = 1, + /obj/item/reagent_containers/food/snacks/burger/superbite = 1) + + default_price = 25 + extra_price = 300 + payment_department = ACCOUNT_SEC diff --git a/aquila/icons/obj/vending.dmi b/aquila/icons/obj/vending.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3151ee88b485a879ba75ad4957008d5df5e53464 GIT binary patch literal 1028 zcmV+f1pE7mP)YI8QVad|ootryO5J z9KxMe$FZ4cOd(@PBw=c2PBjrnE)Fm`HbqWLg=jJ|}cW@cuOkB_>vA^-pXBqSsNGntt)GlB1tV*mgE z0d!JMQvg8b*k%9#0HS(SSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1WWc zY-_i!>6#48uB=`A{~tHWAzT3i0pne_^CRSXdFp$TH(BJFdBTlx{-pkufG`uh75Xn4j}!TTL}`9 z2?C8>)Mc={1zII08Qlg(Ud!qx8+dI%1ylle@%LT>6Calb{2gfW9I)d8dNLfU;FNx6 z1v@Svitg!}R6*@qY^p&2>wRf3se&H9@idG~8Cvli&_YANiq`@A!wGv+hE{wT@Z$&y zFlA`N>wv@lgo80d8~$(fz<_W*-u-m#9B<-$kXB5pU-J*Yr9+w?O&m