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

Desnowflakes mechs, take 3 (actually functional edition) #10014

Merged
merged 54 commits into from
May 18, 2024
Merged

Desnowflakes mechs, take 3 (actually functional edition) #10014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
f0d0075
Initial commit, only repaths
Tsar-Salat Oct 12, 2023
4776b7b
oops, rename
Tsar-Salat Oct 12, 2023
269f6f4
_mecha 1st pass
Tsar-Salat Oct 12, 2023
928af32
/combat/ pass 1
Tsar-Salat Oct 12, 2023
aea771d
/mecha_equipment/ first pass
Tsar-Salat Oct 12, 2023
f66cb4e
medical_tools
Tsar-Salat Oct 12, 2023
ad9342b
mining_tools first pass
Tsar-Salat Oct 12, 2023
42e6848
Mining_tools
Tsar-Salat Oct 12, 2023
919ae62
work_tools first pass
Tsar-Salat Oct 12, 2023
530019d
weapons first pass
Tsar-Salat Oct 12, 2023
27d1b25
mecha_actions first pass
Tsar-Salat Oct 12, 2023
c78b38b
mecha_control & mecha_construct
Tsar-Salat Oct 12, 2023
15ef630
mecha_defense pass 1
Tsar-Salat Oct 12, 2023
159b30d
mecha_topic
Tsar-Salat Oct 12, 2023
46eda48
working
Tsar-Salat Oct 12, 2023
4834ce0
odysseus
Tsar-Salat Oct 12, 2023
737f77d
conflict fixes
Tsar-Salat Oct 12, 2023
0e0ae1f
BEGONE SLEEPS!!!
Tsar-Salat Oct 12, 2023
a87bfdd
fixes 2
Tsar-Salat Oct 12, 2023
7697bbb
CONFLICT FREEEEE
Tsar-Salat Oct 12, 2023
54a411a
fix maps
Tsar-Salat Oct 12, 2023
bb4a260
I think I inherited it right?
Tsar-Salat Oct 12, 2023
798b7df
https://github.com/tgstation/tgstation/pull/53470/
Tsar-Salat Oct 12, 2023
2dc0304
hacky bs lmaooo
Tsar-Salat Oct 12, 2023
d8f4518
Merge remote-tracking branch 'upstream/master' into mech-refactor-tak3
Tsar-Salat Nov 7, 2023
5acfc9f
fix bad cooldown
Tsar-Salat Nov 14, 2023
9f3d2d0
add back ripley
Tsar-Salat Nov 14, 2023
9f42890
occupants
Tsar-Salat Nov 14, 2023
9c2d1d8
515
Tsar-Salat Nov 14, 2023
efa1280
guh
Tsar-Salat Nov 16, 2023
730aee3
Merge remote-tracking branch 'upstream/master' into mech-refactor-tak3
Tsar-Salat Dec 7, 2023
04e12a6
remove backslashes
Tsar-Salat Dec 7, 2023
14a5426
retry
Tsar-Salat Dec 7, 2023
0fdf671
Merge remote-tracking branch 'upstream/master' into mech-refactor-tak3
Tsar-Salat Dec 10, 2023
d3d8fea
https://github.com/tgstation/tgstation/pull/53624
Tsar-Salat Dec 10, 2023
a07b6a1
https://github.com/tgstation/tgstation/pull/54529
Tsar-Salat Dec 10, 2023
180db33
prettier
Tsar-Salat Dec 10, 2023
1e9ad2a
https://github.com/tgstation/tgstation/pull/54454
Tsar-Salat Dec 12, 2023
e907c5f
Merge remote-tracking branch 'upstream/master' into mech-refactor-tak3
Tsar-Salat Dec 15, 2023
cf2a8fb
Merge branch 'master' into mech-refactor-tak3
Tsar-Salat Dec 20, 2023
481c044
delete unused reference
Tsar-Salat Dec 20, 2023
a8b212b
Merge remote-tracking branch 'Upstream/master' into mech-refactor-tak3
Tsar-Salat Jan 5, 2024
425f879
https://github.com/BeeStation/BeeStation-Hornet/pull/10304
Tsar-Salat Jan 5, 2024
99d5201
Merge remote-tracking branch 'Upstream/master' into mech-refactor-tak3
Tsar-Salat Jan 19, 2024
f3c4d84
update_appearance
Tsar-Salat Jan 26, 2024
f5ee114
Merge remote-tracking branch 'Upstream/master' into mech-refactor-tak3
Tsar-Salat Mar 3, 2024
8298c7d
Merge remote-tracking branch 'BeeStation/master' into mech-refactor-tak3
Tsar-Salat Mar 10, 2024
a18638c
Merge remote-tracking branch 'Upstream/master' into mech-refactor-tak3
Tsar-Salat Mar 28, 2024
dca4858
set mech weapons as firer to blacklist them from hitting themselves
Tsar-Salat Apr 27, 2024
c01fa3e
fixes mech z-fall & punch force & diagonal movement
Tsar-Salat Apr 27, 2024
97a803e
Merge remote-tracking branch 'BeeStation/master' into mech-refactor-tak3
Tsar-Salat May 8, 2024
55dd9bb
Merge remote-tracking branch 'BeeStation/master' into mech-refactor-tak3
Tsar-Salat May 11, 2024
a7dcc39
Merge remote-tracking branch 'BeeStation/master' into mech-refactor-tak3
Tsar-Salat May 17, 2024
59e2c0f
fix self-healing exploit
Tsar-Salat May 17, 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
4 changes: 1 addition & 3 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
View file
Open in desktop

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

34 changes: 16 additions & 18 deletions _maps/RandomRuins/SpaceRuins/mechtransport.dmm
View file
Open in desktop

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

Loading
Loading