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.

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

Jump to bottom

Fixes cost of some Mecha weapons in the Exosuit Fab #6745

Merged
merged 38 commits into from
Sep 11, 2024
Merged

Fixes cost of some Mecha weapons in the Exosuit Fab #6745

Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
de80a96
LORE UPDATE 27AUG23
GySgtMurphy Aug 28, 2023
6cf0621
Merge branch 'master' into master
GySgtMurphy Aug 29, 2023
1337df1
De-Russia-fication of bullets
GySgtMurphy Aug 30, 2023
9b0962c
Update new_player.dm
GySgtMurphy Aug 30, 2023
4e1899f
Merge branch 'master' into master
GySgtMurphy Aug 30, 2023
af4896d
Merge branch 'master' into master
GySgtMurphy Aug 31, 2023
34453c0
Merge branch 'master' into master
GySgtMurphy Aug 31, 2023
2c6db09
Update new_player.dm
GySgtMurphy Aug 31, 2023
1501320
Merge branch 'master' of https://github.com/GySgtMurphy/Citadel-Stati…
GySgtMurphy Aug 31, 2023
f9af5e3
Merge branch 'master' into master
GySgtMurphy Sep 2, 2023
34ca128
Update new_player.dm
GySgtMurphy Sep 2, 2023
8798dd6
Merge branch 'Citadel-Station-13:master' into master
GySgtMurphy Sep 3, 2023
05c7bc8
Merge branch 'Citadel-Station-13:master' into master
GySgtMurphy Sep 4, 2023
c3a6b7f
Merge branch 'Citadel-Station-13:master' into master
GySgtMurphy Sep 9, 2023
fc2989a
Merge branch 'master' of https://github.com/GySgtMurphy/Citadel-Stati…
GySgtMurphy Sep 16, 2023
a7b3a2c
Merge branch 'Citadel-Station-13:master' into master
GySgtMurphy Dec 26, 2023
c26f78d
Merge branch 'master' of https://github.com/GySgtMurphy/Citadel-Stati…
GySgtMurphy Mar 10, 2024
9a5a8dc
Merge branch 'master' of https://github.com/GySgtMurphy/Citadel-Stati…
GySgtMurphy Apr 20, 2024
bdd99c0
Merge branch 'Citadel-Station-13:master' into master
GySgtMurphy Aug 29, 2024
acf31e5
Merge branch 'Citadel-Station-13:master' into master
GySgtMurphy Sep 1, 2024
9edc554
Adds in a Gauss rifle, Gauss bullet, and AC10.
GySgtMurphy Sep 1, 2024
2e10e95
Merge branch 'Citadel-Station-13:master' into master
GySgtMurphy Sep 1, 2024
7a2b8cb
Second try, adding the gauss, AC10 and such.
GySgtMurphy Sep 1, 2024
94f49f0
TAKE. THREE.
GySgtMurphy Sep 1, 2024
c1a9764
Merge branch 'master' into master
GySgtMurphy Sep 1, 2024
3fc4518
OKAY, FINE, FIXING CAPITALIZATION
GySgtMurphy Sep 1, 2024
82074fd
Merge branch 'master' of https://github.com/GySgtMurphy/Citadel-Stati…
GySgtMurphy Sep 1, 2024
c2f3e3f
AAAA I MISSED SOMETHING.
GySgtMurphy Sep 1, 2024
753b5c5
Merge remote-tracking branch 'upstream/master'
GySgtMurphy Sep 3, 2024
7ce0d49
WORK DAMMIT
GySgtMurphy Sep 3, 2024
21099bd
WORK YOU SUMBITCH
GySgtMurphy Sep 3, 2024
193989a
WORK YOU MOTHER-
GySgtMurphy Sep 3, 2024
b048b15
Need to up the damage a little.
GySgtMurphy Sep 4, 2024
3b36b95
Merge branch 'master' into master
GySgtMurphy Sep 4, 2024
399b4fd
I guess I shouldn't make things *too* OP
GySgtMurphy Sep 5, 2024
f1c0314
Ups the cost of the AC/10 and Gauss Rifle
GySgtMurphy Sep 10, 2024
062f048
Merge branch 'master' of https://github.com/GySgtMurphy/Citadel-Stati…
GySgtMurphy Sep 10, 2024
c69f81d
Ups the material cost on AC/10 and Gauss Rifle
GySgtMurphy Sep 10, 2024
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/research/designs/mechfab_designs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,11 +518,13 @@
design_name = "AC 10"
id = "mech_lmg_heavy"
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg_heavy
materials_base = list(MAT_STEEL = 12000, MAT_GLASS = 4000, MAT_PLASTIC = 3000, MAT_SILVER = 1500, MAT_COPPER = 4000)

/datum/design/science/mecha/gauss_rifle
design_name = "Gauss Rifle"
id = "mech_gauss_rifle"
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/gauss_rifle
materials_base = list(MAT_STEEL = 16000, MAT_GLASS = 8000, MAT_PLASTIC = 4000, MAT_SILVER = 3500, MAT_COPPER = 8000)

/datum/design/science/mecha/rigged_lmg
design_name = "Jury-Rigged Machinegun"
Expand Down
Loading