Skip to content

Update automatic.dm #35

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.

Sign up for GitHub

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

Open
cornercube wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update automatic.dm #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7312577
Update automatic.dm
cornercube Apr 6, 2022
378a109
Update oasis.dm
cornercube Apr 6, 2022
6e7775a
Update oasis.dm
cornercube Apr 6, 2022
9f23a6c
Update automatic.dm
cornercube Apr 6, 2022
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
2 changes: 2 additions & 0 deletions code/modules/jobs/job_types/oasis.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Mayor
jobtype = /datum/job/oasis/f13mayor
ears = /obj/item/radio/headset/headset_town
id = /obj/item/card/id/silver/mayor
suit = /obj/item/gun/ballistic/automatic/wt550
backpack = /obj/item/storage/backpack/satchel/explorer
satchel = /obj/item/storage/backpack/satchel/explorer
l_pocket = /obj/item/storage/bag/money/small/oasis
Expand All @@ -73,6 +74,7 @@ Mayor
/obj/item/stack/f13Cash/caps/onezerozerozero = 1,
/obj/item/storage/box/citizenship_permits = 1, \
/obj/item/pen/fountain/captain = 1,
/obj/item/ammo_box/magazine/m473/small = 2
)


Expand Down
9 changes: 5 additions & 4 deletions code/modules/projectiles/guns/ballistic/automatic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,19 +607,20 @@

//WT-550 4.7mm, 20 round magazine
/obj/item/gun/ballistic/automatic/wt550
name = "WT-550"
desc = "A compact PDW derived from the G11, firing the same 4.73mm rounds."
name = "4.73mm carbine"
desc = "A WT-550 personal defense weapon developed by West-Tek, fires 4.73mm caseless rounds."
item_state = "WT550"
mag_type = /obj/item/ammo_box/magazine/m473/small
slowdown = 0.45
burst_size = 1
is_automatic = TRUE
automatic = TRUE
extra_damage = 20
autofire_shot_delay = 1.75
autofire_shot_delay = 2.25
extra_penetration = 0.2
w_class = WEIGHT_CLASS_NORMAL
weapon_weight = WEAPON_MEDIUM
spread = 0
spread = 3 //foregrip
fire_delay = 1
can_bayonet = TRUE
knife_x_offset = 25
Expand Down