Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gunact #285

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions _maps/map_files/Atlas/atlas.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions _maps/map_files/generic/CentCom.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions aquila/aquila.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Original file line number Diff line number Diff line change
@@ -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
16 changes: 16 additions & 0 deletions aquila/code/modules/projectiles/guns/ballistic/revolver.dm

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

po co dublować istniejący rewolwer detektywa oraz dlaczego szybciej strzelają od LMG beryla?

Original file line number Diff line number Diff line change
@@ -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
31 changes: 31 additions & 0 deletions aquila/code/modules/vending/gunact.dm

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ten rewolwer nagant to nie jest przypadkiem armata na podstawie rewolweru syndykatu ten co bije 60 na kulke? Moim zdaniem te bronie powinny mieć boarding piny dodatkowo.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automat powinien mieć restocking jakiś.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nie powinien ten automat też mieć blokad jak squad vendor? W sumie, dlaczego jest dodawany osobny automat jak już jest squad vendor? Jak już to lepiej jest dodać więcej do squad vendoru i zrobić, że automatycznie daje pozwolenie na broń i je wydawanie jak jest kod czerwony czy tam zebra czy inny uj.

Original file line number Diff line number Diff line change
@@ -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 = "<b>Wolność kocham i rozumiem, wolności oddac nie umiem</b>"
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
Binary file added aquila/icons/obj/vending.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile/bullets/revolver.dm

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

czy naprawdę trzeba te pociski modyfikować? rewolwer syndykatu nie jest wart już swojego TC dodatkowo iirc też pare innych broni dostaje z rykoszetu, no chyba że @Joker66613 tak chciał.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nie mam z tym projektem nic wspólnego.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/obj/item/projectile/bullet/n762
name = "7.62x38mmR bullet"
damage = 60
damage = 20 // AQ edit

// .50AE (Desert Eagle)

Expand Down
Loading