75 Commits

Author SHA1 Message Date
SandPoot 11aa13e4e8 part 1 - 41928 2023-07-26 21:45:43 -03:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
Jerry Wester ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
Jerry Wester f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
shellspeed1 bc13bdb177 sort of working fire selector, still need to get the safety stuff figured out and finish getting the selector working properly 2022-09-09 22:23:05 -07:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Timothy Teakettle f6b9858f4f adds snake coiling (#15514)
* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant
2022-02-23 22:01:13 -07:00
keronshb b444afede3 ACTION BUTTON SLAM 2021-09-11 12:06:18 -04:00
silicons 3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon
(READY) Ports Space Dragon Midround Event.
2021-06-18 20:03:43 -07:00
Artur f3e16b298b https://github.com/tgstation/tgstation/pull/56588 2021-06-16 01:15:21 +03:00
keronshb 78db6bd5c2 Ports Floor Cluwnes
Oh fuck oh god
2021-05-26 21:58:35 -04:00
keronshb bc35ffeaa2 [READY] Space Dragon Quality Improvement Update (#57942)
qol: Space Dragon's gust attack is now tied to right click instead of an ability button
balance: Space Dragon has received numerous balance changes, most notably that Space Dragon will stall the shuttle until it loses or completes its objectives
fix: Fixed numerous bugs with Space Dragon, most notably the rifts not vanishing after Space Dragon's death
soundadd: Space Dragon now has a custom roar for dying and winning
imagedel: Deleted now unused Space Dragon ability icon
refactor: Space Dragon's speed changes are now controlled using movespeed modifiers instead of direct speed adjustments

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-05-14 12:35:53 -04:00
silicons e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real
[HERETICS] Void & a handful of heretics-related PRS
2021-03-18 06:38:40 -06:00
kiwedespars 5ce42584b2 void tp effect, sound changes 2021-03-10 21:16:08 -08:00
kiwedespars 3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
Dan-Neposh 04d5721c4d Merge branch 'master' into clockcultrework_v2 2021-01-14 19:51:15 -05:00
timothyteakettle 76b291c0b5 action 2020-12-13 01:16:25 +00:00
DeltaFire 73d3234882 buncha changes 2020-12-07 22:15:04 +01:00
Dan-Neposh 946acc9c8f various grammar fixes/eminence rework prep 2020-10-19 14:11:19 -04:00
silicons 8b48cab574 Merge pull request #13233 from Hatterhat/za-hando
[READY] za hando - a pr about ling claws and punching shit
2020-10-10 21:59:05 -07:00
Timothy Teakettle 1b75ccb39d puddle 2020-09-29 18:38:25 +01:00
Hatterhat 5dd09c2402 the one where i make it work 2020-08-28 20:20:19 -05:00
kiwedespars a7d68281a3 new changes
- runes can now be destroyed by non-heretics using a bible or a null rod
- mansus grasp now has a unique inhand color.
- madness grasp now has a unique inhand color.
- blood siphon is now redder.
- silence spell, lasts 20 seconds, gives an obvious message to the victim.
- fire immunity passive for ash
- guaranteed dislocation passive for flesh
- rust grasp passive for disgusting mood/vomiting
- rust grasp cooldown reduced by 75% on hit
- living heart now checks z-level when telling you where someone is.
- grasp of decay: forced corrosion for 20 seconds, can make you vomit. probably shitcode.
- madness touch: give people trauma, braindamage and a terrible mood.
- nightwatcher's rite: fire shotgun that can do 75 damage on point blank
- flesh sickle buffed a bit.
- descriptions touched up a bit.
2020-08-28 16:42:25 -07:00
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
SmArtKar 46c3e9e54d Shuttles 2020-06-16 18:16:14 +03:00
Timothy Teakettle 14c9ab2ff1 ports tgs regal rats (#12479)
* port regal rats

* fix missing line

* royal rat goes after humans too

* okay dont let them attack people

* let them attack people but at less damage

* remove header
2020-06-09 03:28:00 -07:00
Ghommie 05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Artur 65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +03:00
Artur f40f07b033 [READY]Skateboard overhaul (#45657)
* skeet skeet

* scoot

* removes debug message

* merge conflict

* oopsie

* polish, new board types

* begone

* actioninja review

* passtable trait

* fixes indent

* dwarfism check

* check for existing flag

* check existing trait

* screwdriver returns FALSE
2020-04-01 12:05:27 +03:00
Seris02 cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghommie 97315940fe Polychromic element. 2020-03-08 01:01:21 +01:00
Seris02 de6e8012f3 balances yee 2020-02-26 17:49:37 +08:00
Seris02 68f15e16e7 fixed 2020-02-22 20:06:35 +08:00
Seris02 ee7064840d merge conflicts fixed finally 2020-02-05 18:42:16 +08:00
Seris02 5f1a2bed76 rising bass changes 2020-01-31 12:42:22 +08:00
Seris02 ac4489c6a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-11 13:55:29 +08:00
keronshb 1e5d6719ee Fixes Dermal Button Sprites
Should fix the missing sprite issue for the Dermal Button nanites
2020-01-07 15:52:29 -05:00
Seris02 862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
Useroth 8151a1f3ff Merged master into this branch. 2019-12-16 12:06:30 +01:00
BlackMajor 74cc1ec547 Merge pull request #10177 from BlackMajor/FIST
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
2019-12-16 14:14:35 +13:00
BlackMajor 4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13:00
Useroth 5e836c51e4 Forgot to track the new files 2019-12-08 14:05:05 +01:00
Artur 4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
Artur 02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
Weblure 3dac695d53 Merge branch 'master' into Xenobio-Hotkeys 2019-11-10 21:55:22 -07:00
Weblure 0a793754a2 Updates actions_silicon.dmi to include hotkey_help
Adds icon for the hotkey_help button added to the xenobio console.
2019-10-01 22:30:36 -07:00
Tupinambis 37aacacf30 Finishes up sprite changes 2019-09-23 20:20:23 -05:00
Sishen a2a440a92c golem gang golem gang golem gang golem gang 2019-06-23 04:27:50 -04:00
Ghommie 5a69499927 Hol up, unrelated PR time, atomization. 2019-06-07 01:32:15 +02:00
BlackMajor 583bfdc66a Ling HUD icons
Adds a shit load of HUD icons for changeling actions.
2019-03-24 23:34:49 +13:00