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

Evil Clones #2175

Closed
wants to merge 48 commits into from
Closed

Evil Clones #2175

Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
2d315b9
Antag
Uristthedorf Jun 5, 2024
cca9609
Update exp_cloner.dm
Uristthedorf Jun 5, 2024
f3d5dd7
Hopefully fixes
Uristthedorf Jun 6, 2024
ec7ada7
Update exp_cloner.dm
Uristthedorf Jun 6, 2024
eb62758
Examining evil cloner tells you it's evil.
Uristthedorf Jun 6, 2024
f6dd297
Update monkestation/code/game/machinery/exp_cloner.dm
Uristthedorf Jun 6, 2024
a02bc30
Update monkestation/code/game/machinery/exp_cloner.dm
Uristthedorf Jun 6, 2024
f13efbd
Update monkestation/code/game/machinery/cloning.dm
Uristthedorf Jun 6, 2024
e096666
Examine moved down to exp_cloner.dm
Uristthedorf Jun 6, 2024
f1f7c15
Merge branch 'EvilClone' of https://github.com/Uristthedorf/Monkestat…
Uristthedorf Jun 6, 2024
eb1668e
Being evil makes it clone slower.
Uristthedorf Jun 6, 2024
26b61cf
Corrects comment
Uristthedorf Jun 6, 2024
2fadbc7
Update cloning.dm
Uristthedorf Jun 6, 2024
2265c08
Moves evil back down
Uristthedorf Jun 6, 2024
e6d5783
Better
Uristthedorf Jun 6, 2024
bbbb78c
Oops forgot to remove
Uristthedorf Jun 6, 2024
1805fff
Update exp_cloner.dm
Uristthedorf Jun 7, 2024
44a9a0c
Evil clones have unnaturally glowing red eyes.
Uristthedorf Jun 8, 2024
e7ed532
New objectives
Uristthedorf Jun 9, 2024
6c88d09
More evil clone changes.
Uristthedorf Jun 9, 2024
15f5d90
Evil clone event
Uristthedorf Jun 9, 2024
ca8d511
Update evil_event.dm
Uristthedorf Jun 10, 2024
ec6318c
Fixes it saying you have no objectives when you actually do
Uristthedorf Jun 10, 2024
e29b9df
Merge remote-tracking branch 'upstream/master' into EvilClone
Uristthedorf Jun 10, 2024
b0645da
Apply suggestions from code review
Uristthedorf Jun 10, 2024
3efe8ac
Update evil_clone_objective.dm
Uristthedorf Jun 10, 2024
8ab3789
I'm GUESSING this is what was wanted
Uristthedorf Jun 10, 2024
f6274c0
Fix?
Uristthedorf Jun 10, 2024
3c821f0
Revert "Fix?"
Uristthedorf Jun 10, 2024
02aba5c
Revert "I'm GUESSING this is what was wanted"
Uristthedorf Jun 10, 2024
8085975
Update exp_cloner.dm
Uristthedorf Jun 10, 2024
31b534d
Apply suggestions from code review
Uristthedorf Jun 10, 2024
1bf0e14
Update evil_event.dm
Uristthedorf Jun 11, 2024
3dd4e19
Update evil_event.dm
Uristthedorf Jun 11, 2024
85293b7
Cloning console is EMP immune.
Uristthedorf Jun 12, 2024
821b282
Adds clone army kit traitor item
Uristthedorf Jun 13, 2024
1a4e3a7
When you give evil clones an objective, they're automatically taught …
Uristthedorf Jun 13, 2024
89a5460
Gives cloner kit to more jobs.
Uristthedorf Jun 14, 2024
ce801fd
Adds stuff I forgot to add for the syndie item stuff.
Uristthedorf Jun 14, 2024
4808722
Fixes runtime
Uristthedorf Jun 14, 2024
b9820f7
Revert "Fixes runtime"
Uristthedorf Jun 15, 2024
d17643c
Clones can examine a cloner to know its objective.
Uristthedorf Jun 16, 2024
b0070de
Merge remote-tracking branch 'upstream/master' into EvilClone
Uristthedorf Jun 16, 2024
673ee3e
Buffs syndicate clones.
Uristthedorf Jun 18, 2024
9775be8
Guide kit and part buff
Uristthedorf Jun 20, 2024
bf25a75
Cloner corruption event improvement.
Uristthedorf Jun 25, 2024
d7947f2
Merge remote-tracking branch 'upstream/master' into EvilClone
Uristthedorf Jun 25, 2024
d4756a7
Merge remote-tracking branch 'upstream/master' into EvilClone
Uristthedorf Jul 2, 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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into EvilClone
  • Loading branch information
@Uristthedorf
Uristthedorf committed Jun 10, 2024
commit e29b9df18cb6dc5902566e42f735a3da5e636984

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.