Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

MECH MELEE UPDATE PART 2: AWESOME WEAPONS EDITION #17717

Merged
Bibby0110 merged 31 commits into from
Mar 5, 2023
Merged

MECH MELEE UPDATE PART 2: AWESOME WEAPONS EDITION #17717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b7d8a93
baton katana and spear
Mqiib Jan 28, 2023
c3daf23
tweaks
Mqiib Jan 28, 2023
dda40e4
e
Mqiib Jan 28, 2023
98d9620
ee
Mqiib Jan 28, 2023
065e7fc
Merge branch 'master' into MechMeleePartTwo
Mqiib Jan 31, 2023
aa68bfd
lets GO
Mqiib Jan 31, 2023
2b8b239
slower
Mqiib Jan 31, 2023
0acb54a
this might work
Mqiib Feb 4, 2023
4f48681
comment
Mqiib Feb 4, 2023
b99f801
plus rapier
Mqiib Feb 4, 2023
bcc6d6b
yeah that works maybe
Mqiib Feb 4, 2023
6cf9ec8
small tweaks that i did while spriting
Mqiib Feb 6, 2023
b192fd5
holy shit its late
Mqiib Feb 10, 2023
811bb3e
rapier fix
Mqiib Feb 11, 2023
bc0932f
Merge remote-tracking branch 'origin/master' into MechMeleePartTwo
Mqiib Feb 11, 2023
aa63b03
sprite get
Mqiib Feb 11, 2023
3dbe9e1
its done i guess
Mqiib Feb 11, 2023
6e4e532
last fixes
Mqiib Feb 11, 2023
9f77b6a
nodamage
Mqiib Feb 11, 2023
c8527e9
Merge branch 'master' into MechMeleePartTwo
Mqiib Feb 20, 2023
57df25a
this was supposed to not be a bug fix
Mqiib Feb 23, 2023
d089984
weapon tweaks
Mqiib Feb 25, 2023
4fa95ac
more tweaks n changes n variables
Mqiib Feb 25, 2023
c6f52fb
FUCK armour penetration
Mqiib Feb 25, 2023
fc6c2c2
small island country
Mqiib Feb 26, 2023
a08a11b
SMALL ISLAND COUNTRY
Mqiib Feb 26, 2023
d51d2a6
SM A L L IS L AND CO UN T RY
Mqiib Feb 26, 2023
cb562de
Merge branch 'master' into MechMeleePartTwo
Mqiib Mar 3, 2023
bd13a33
combat design
Mqiib Mar 3, 2023
c51b6fc
Merge remote-tracking branch 'origin/MechMeleePartTwo' into MechMelee…
Mqiib Mar 3, 2023
391ba3d
turf stabbing
Mqiib Mar 4, 2023
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
4 changes: 3 additions & 1 deletion code/game/mecha/combat/gygax.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
operation_req_access = list(ACCESS_SYNDICATE)
internals_req_access = list(ACCESS_SYNDICATE)
wreckage = /obj/structure/mecha_wreckage/gygax/dark
max_equip = 4
max_equip = 5
destruction_sleep_duration = 20

/obj/mecha/combat/gygax/dark/loaded/Initialize()
Expand All @@ -35,6 +35,8 @@
ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang
ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/melee_weapon/sword/rapier
ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/teleporter
ME.attach(src)
ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
Expand Down
Loading