mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-12 09:54:03 +00:00
7fbecfe4ff
* Adds backend clockcult code (#17136) * probably good to go * Update stylesheet.dm * revert speech * shut the fuck up, CI. * did the wrong thing lmao * shuttles are good to go * tick it * okay lets see how this goes * axe the event shuttles for starters * i saved these dw * probably good for now * clean up sigil code * layer fix * a * D'oh * The melbert change I can do on my laptop Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> * elementizes * Update modular_skyrat/modules/clock_cult/code/hint_element.dm Co-authored-by: Tastyfish <crazychris32@gmail.com> * Apply suggestions from code review Co-authored-by: Tastyfish <crazychris32@gmail.com> * Update modular_skyrat/modules/clock_cult/code/hint_element.dm Co-authored-by: Tastyfish <crazychris32@gmail.com> * all good to me * base vitality nerf and cleanup * fuck * fix diveworm innaccuracy * Update modular_skyrat/modules/cortical_borer/code/cortical_borer_abilities.dm * Update modular_skyrat/modules/clock_cult/code/actions/_action.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * Update modular_skyrat/modules/clock_cult/code/actions/_action.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * tf3 tf4 * TF4 reviews * antag datumization and some more bits and bobs * tgui nits to be picked * I kind of forgot this shocks the shit out of you * TODO: test this * fixes and qol * post-element cleanup * whoops * Apply suggestions from code review Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/modules/clock_cult/code/actions/whirring_convergence.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * golden's changes * the cleanup * upstream fix * 515 * Update gear_base.dm * Update _sigil.dm * lint * cleanup * untruth begone * index * icon skew * Update antagonist.dm * Update trap.dm * good to go * CI Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Tastyfish <crazychris32@gmail.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * [PROJECT] Integration Cog Scripture (#18687) coggers * [PROJECT] Transmission Sigil (#18684) * yuh * a * repath * Update sigil_transmission.dm * [PROJECT] Tinkerer's Cache (#18705) * forgery * comment * Update tinkerers_cache.dm * replica --------- Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * [PROJECT] Interdiction Lens (#18928) * adds interdiction lens * nerf + fix * guh * Update modular_skyrat/modules/clock_cult/code/structures/interdiction_lens.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * Update modular_skyrat/modules/clock_cult/code/structures/interdiction_lens.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * Update modular_skyrat/modules/clock_cult/code/structures/interdiction_lens.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> --------- Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * [PROJECT] Ocular warden (#19499) * adds ocular wardens * Update modular_skyrat/modules/clock_cult/code/structures/ocular_warden.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * Update modular_skyrat/modules/clock_cult/code/structures/ocular_warden.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * tf4 review --------- Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * [PROJECT] Clockcult outfits (#19500) antag up and outfit * [PROJECT] Replica Fabricator 2 (#18926) * updated * tf4 review * [PROJECT] Hateful Manacles (#19622) * might add this idk yet * guh * balance * Update modular_skyrat/modules/clock_cult/code/scriptures/servitude/hateful_manacles.dm Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> --------- Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> * [PROJECT] Vitality Sigil (#19625) * adds the vitality sigil * balance, fix * a * [PROJECT] Clockwork Marauder (#19677) * woe, omen upon you * shield * melbview * [PROJECT] Outpost of Cogs (#19696) * adds mini-reebe * melbert review and some touches * static * props n shit * coggers * less cancer * Update modular_skyrat/modules/clock_cult/code/turf.dm * [PROJECT] Refactors some clock cult code (#19644) refactors some scripture code * [PROJECT] Clockwork Armaments (#19663) * clockwork armaments * a * a^2 * [PROJECT] Removes Clock soul (resprites) (#18945) * adieu 2018 sprites * finally got around to this * [PROJECT] Kindle (#19501) * bullshit stun hand revengance * whoops * [PROJECT] Prosperity Prism (#19877) * adds the prosperity prism * a * w2 * w3 * Update tinkerers_cache.dm * Update _powered.dm * [PROJECT] Clock balance & fixes (#20096) * whoooo boy this is a lotta changes * slab spell * clarity * smol bug fixes * a few bits and bobs * fixes ci * a * CI fixing --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Tastyfish <crazychris32@gmail.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>