-
Notifications
You must be signed in to change notification settings - Fork 376
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.
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
Clockwork Cult #658
Merged
Merged
Clockwork Cult #658
Changes from 21 commits
Commits
Show all changes
66 commits
Select commit
Hold shift + click to select a range
a3acb62
Clock-rework 1
BeebBeebBoob 454ae5a
Clock-rework 2
BeebBeebBoob 4d09e56
Clock-Rework 3
BeebBeebBoob 24bcc92
Clock-Rework 4
BeebBeebBoob 321ac30
Clock-Rework 4.1
BeebBeebBoob 5167b68
Clock-Rework 5
BeebBeebBoob 13ceac3
Clock-Rework 6
BeebBeebBoob cd57857
Clock-Rework 7
BeebBeebBoob 73e762f
Clock-Rework 8
eb95c66
Vallat suggests
BeebBeebBoob 53b2bfb
Clock-Rework 9
72f625c
spell-wall-fix
9b9b61a
some dmi conflicts and mouse clockwork
3bf017b
Merge branch 'master220' of https://github.com/ss220-space/Paradise i…
abe015f
Bruh
41cc7ba
Merge branch 'ss220-space-master220' into ClockWorkers
733a511
FUCK
d106b07
thing
942be07
items,spellrefactor,de_shard and summonratvar
4c39aa5
spots fix
ec0fe26
REEE
258d9db
cogscarab and handies
eebcc5f
Gateway for ratvar e.t.c. the ritual
d6c9596
ratvar can now be summoned by players
e59875c
e
7902bbd
Merge branch 'master220' of https://github.com/ss220-space/Paradise i…
c344f74
EEE
a1db86d
Merge branch 'ss220-space-master220' into ClockWorkers
0ce7d77
lavaland ratvar. wat, it's not dead wtf
865da27
robotssssssssss
3521760
Revert "lavaland ratvar. wat, it's not dead wtf"
fa5cc9f
Lavaland
ab3d84a
Hand spells yeaaaa
b59dac6
tgui fix and cloth fix
1f7cb30
loop-anim-thinges
bc6c2f2
image-conflict
22a21e5
robot change
5e94dad
Roboto Refactor Icons and eyes and ratvar_act
0dc3e57
fu
8166465
ratvar_act and stuff
8fcc2bb
Vallat suggests
BeebBeebBoob 786aea8
suggests
d06ffd5
more suggests
6c2c48d
Merge branch 'master220' into ClockWorkers
BeebBeebBoob b4afdb5
FINAL TOUCHES
d222297
Merge branch 'ClockWorkers' of https://github.com/BeebBeebBoob/SS220 …
c030517
eee
5f2a637
SHIT
d63a55b
return FALSE
4ebb813
balance
1c38744
balance and fixes
4573e8b
more fixes
b6634ef
bugs
fdf7839
css
6568f87
fixs and QoLs
e6ddfbf
fix and some punishes to unclockers
ae4d2b1
breaking upload totally
8c091cd
Vallat suggests
BeebBeebBoob 5dfd607
fixes
b4e64da
smol fix
dee907a
moar fix
e50606e
fix
d2f9857
FIX
90e7a09
Merge branch 'master220' of https://github.com/ss220-space/Paradise i…
bbc7a8c
FU-
9b0c7ff
Merge branch 'ss220-space:master220' into ClockWorkers
BeebBeebBoob File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,125 @@ | ||
// Clockwork Raret (Power) | ||
/// REMINDER: The clockwork_power(var) and clockwork_beacons(list) have been moved at _glovalvars/game_modes | ||
|
||
//Clockwork Magic | ||
/// How many on-hand spells | ||
#define CLOCK_MAX_HANDSPELLS 2 | ||
|
||
// state for spell | ||
#define NO_SPELL 0 | ||
#define A_SPELL 1 | ||
#define CASTING_SPELL -1 | ||
|
||
// Clockslab enchant type | ||
#define STUN_SPELL 1 | ||
#define EMP_SPELL 2 | ||
#define KNOCK_SPELL 3 | ||
#define TIME_SPELL 4 | ||
#define REFORM_SPELL 5 | ||
#define TELEPORT_SPELL 6 | ||
// Ratvarian spear enchant type | ||
#define CONFUSE_SPELL 1 | ||
#define DISABLE_SPELL 2 | ||
// Clock hammer | ||
#define CRUSH_SPELL 1 | ||
#define KNOCKOFF_SPELL 2 | ||
// Clockwork robe | ||
#define WEAK_REFLECT_SPELL 1 | ||
#define WEAK_ABSORB_SPELL 2 | ||
#define INVIS_SPELL 3 | ||
// armour | ||
#define REFLECT_SPELL 1 | ||
#define FLASH_SPELL 2 | ||
#define ABSORB_SPELL 3 | ||
#define ARMOR_SPELL 4 | ||
// Clockwork gloves | ||
#define FASTPUNCH_SPELL 1 | ||
#define STUNHAND_SPELL 2 | ||
#define FIRE_SPELL 3 | ||
|
||
// spell_enchant(name, type_SPELL, cost, time SECONDS(def 3), action needs) | ||
GLOBAL_LIST_INIT(clockslab_spells, list( | ||
new /datum/spell_enchant("Stun", STUN_SPELL, 125, 15), | ||
new /datum/spell_enchant("Force Passage", KNOCK_SPELL, 100), | ||
new /datum/spell_enchant("Terraform", REFORM_SPELL, 40), | ||
new /datum/spell_enchant("Teleportation", TELEPORT_SPELL, 25) // has do_after 5 seconds | ||
)) | ||
GLOBAL_LIST_INIT(spear_spells, list( | ||
new /datum/spell_enchant("Confusion", CONFUSE_SPELL, 80), | ||
new /datum/spell_enchant("Electrical touch", DISABLE_SPELL, 80) //literal emp | ||
)) | ||
GLOBAL_LIST_INIT(hammer_spells, list( | ||
new /datum/spell_enchant("Crusher", CRUSH_SPELL, 100), | ||
new /datum/spell_enchant("Knock off", KNOCKOFF_SPELL, 100) | ||
)) | ||
GLOBAL_LIST_INIT(robe_spells, list( | ||
new /datum/spell_enchant("Weak Reflection", WEAK_REFLECT_SPELL, 30), | ||
new /datum/spell_enchant("Invisibility", INVIS_SPELL, 60) //WHERE??!?!?!?! | ||
)) | ||
GLOBAL_LIST_INIT(armour_spells, list( | ||
new /datum/spell_enchant("Reflection", REFLECT_SPELL, 100, 10), | ||
new /datum/spell_enchant("Flash", FLASH_SPELL, 25, spell_action = TRUE), | ||
new /datum/spell_enchant("Absorb", ABSORB_SPELL, 100, 10), | ||
new /datum/spell_enchant("Harden plates", ARMOR_SPELL, 100, 15, spell_action = TRUE) | ||
)) | ||
GLOBAL_LIST_INIT(gloves_spell, list( | ||
new /datum/spell_enchant("Hands of North Star", FASTPUNCH_SPELL, 75, spell_action = TRUE), | ||
new /datum/spell_enchant("Stunning", STUNHAND_SPELL, 75), | ||
new /datum/spell_enchant("Red Flame", FIRE_SPELL, 50, spell_action = TRUE) | ||
)) | ||
GLOBAL_LIST_INIT(shard_spells, list( | ||
new /datum/spell_enchant("Electromagnetic Pulse", EMP_SPELL, 300, 40), | ||
new /datum/spell_enchant("Stop the time", TIME_SPELL, 300, 40) | ||
)) | ||
/// Power per crew for summoning. For example if 45 players on station, the Ratvar will demand 45*number. | ||
#define CLOCK_POWER_PER_CREW 400 | ||
#define CLOCK_POWER_GAIN_MAXIMUM 1000 | ||
/// Power gains permanent | ||
#define CLOCK_POWER_CONVERT 150 | ||
#define CLOCK_POWER_SACRIFICE 300 | ||
/// Power gains as time progresses. Goes in process() so it makes x power per second. | ||
#define CLOCK_POWER_BEACON 2 | ||
#define CLOCK_POWER_GENERATOR 10 | ||
#define CLOCK_POWER_COG 1 | ||
#define COG_MAX_SIPHON_THRESHOLD 0.25 //The cog will not siphon power if the APC's cell is at this % of power | ||
|
||
// Clockwork Status | ||
/// At what population does it switch to highpop values | ||
#define CLOCK_POPULATION_THRESHOLD 100 | ||
/// Percent for power to reveal (Lowpop) | ||
#define CLOCK_POWER_REVEAL_LOW 0.5 | ||
/// Percent clockers to reveal (Lowpop) | ||
#define CLOCK_CREW_REVEAL_LOW 0.25 | ||
/// Percent for power to reveal (Highpop) | ||
#define CLOCK_POWER_REVEAL_HIGH 0.3 | ||
/// Percent clockers to reveal (Highpop) | ||
#define CLOCK_CREW_REVEAL_HIGH 0.15 | ||
|
||
// Screen locations | ||
#define DEFAULT_CLOCKSPELLS "6:-29,4:-2" | ||
|
||
// Text | ||
#define CLOCK_GREETING "<span class='clocklarge'>You catch a glimpse of the Realm of Ratvar, the Clockwork Justiciar. \ | ||
You now see how flimsy the world is, you see that it should be open to the knowledge of Ratvar.</span>" | ||
|
||
#define CLOCK_CURSES list("A fuel technician just slit his own throat and begged for death.", \ | ||
"The shuttle's navigation programming was replaced by a file containing two words, IT COMES.", \ | ||
"The shuttle's custodian tore out his guts and began painting strange shapes on the floor.", \ | ||
"A shuttle engineer began screaming 'DEATH IS NOT THE END' and ripped out wires until an arc flash seared off her flesh.", \ | ||
"A shuttle inspector started laughing madly over the radio and then threw herself into an engine turbine.", \ | ||
"The shuttle dispatcher was found dead with bloody symbols carved into their flesh.", \ | ||
"Steve repeatedly touched a lightbulb until his hands fell off.") | ||
|
||
// Misc | ||
#define CLOCKCULT_EYE "#ffb700" | ||
#define CLOCK_COLOER "#ffb700" | ||
// #define SUMMON_POSSIBILITIES 3 | ||
|
||
// Clockwork objective status | ||
#define RATVAR_IS_ASLEEP 0 | ||
#define RATVAR_DEMANDS_POWER 1 | ||
#define RATVAR_NEEDS_SUMMONING 2 | ||
#define RATVAR_HAS_RISEN 3 | ||
#define RATVAR_HAS_FALLEN -1 | ||
|
||
#define RATVAR_SUMMON_POSSIBILITIES 3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
А ты уверен что нужно оставить тут именно НТ стандарт?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
а что ты предлагаешь? нулевой есть так что всё ок. Ну ты можешь свои уникальные прописать
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ну он как минимум направлен на ЭКИПАЖ, а не на клокеров.
Предлагаю его хотя бы модифицировать