shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,912 Commits 5 Branches 0 Tags
b0c53fcc57f3d47be8f8413f0f86ed3fdf044f59
Commit Graph

1945 Commits

Author SHA1 Message Date
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
Lin
0bfb671f4e Merge pull request #14482 from silicons/combat_v7 
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
 2021-06-27 13:04:29 -07:00
silicons
5204f5a6d9 Merge pull request #13991 from Putnam3145/auxtools-atmos 
Replaces extools with auxtools; atmos overhaul
 2021-06-27 11:01:32 -07:00
silicons
08f251a88c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-27 10:44:51 -07:00
Putnam3145
630098c8aa that might be all 2021-06-21 20:03:27 -07:00
Putnam3145
fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
DeltaFire
c7a098da06 suffering (aka, a bunch of fixes) 2021-06-21 19:05:31 +02:00
Putnam3145
c253a2de86 alright how about these 2021-06-21 09:52:54 -07:00
Putnam3145
0bf383a90b does this fix it 2021-06-21 09:18:06 -07:00
Putnam3145
f77495f45d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-21 02:19:51 -07:00
silicons
3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon 
(READY) Ports Space Dragon Midround Event.
 2021-06-18 20:03:43 -07:00
silicons
bc4773b728 Merge pull request #14831 from zeroisthebiggay/beltsprites 
TG Resprite Compendium Atomization Project | Episode Six: Beltslot Sprites & Telebaton Resprite
 2021-06-18 19:58:27 -07:00
keronshb
a192757843 BUG FIX: Changeling Bone Gauntlets work again (#14862) 
* Fixes Bone Gauntlets

* Better fix

* return
 2021-06-18 19:22:48 +02:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
zerothebigboy
b7eecc315f theeighteenthofmany 2021-06-11 19:49:43 -04:00
zerothebigboy
53e95b7356 theseventeenthofmany 2021-06-11 19:48:04 -04:00
Putnam
833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
silicons
a77aa8bd41 Merge pull request #14766 from Linzolle/cultfix 
Fix cult area shenanigans, cult can do stuff in maint again.
 2021-06-09 11:22:26 -07:00
silicons
eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport 
Ports Floor Cluwnes and Cluwnes.
 2021-06-09 11:21:22 -07:00
silicons
dcd80edf5f Merge pull request #14806 from zeroisthebiggay/patch-11 
cuts the amount of essence revenant objective needs in half so it is actually feasibly possible
 2021-06-09 11:17:52 -07:00
silicons
7af470efef Merge pull request #14808 from SandPoot/fixes-soulstones 
Fixes soulstones runtiming
 2021-06-09 11:17:25 -07:00
silicons
7963dce24e Merge pull request #14712 from keronshb/hereticadjustments 
Minor Heretic rework and fixes (Includes shifting realities and more)
 2021-06-09 11:12:23 -07:00
SandPoot
00bb96d467 upload soulstone.dm 2021-06-08 12:32:12 -03:00
zeroisthebiggay
536135ec02 last bit of finetuning 2021-06-08 01:17:10 -04:00
zeroisthebiggay
55075fb31b Update revenant.dm 2021-06-08 01:15:03 -04:00
zeroisthebiggay
538f1c802d Update revenant.dm 2021-06-08 01:13:12 -04:00
silicons
1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
keronshb
70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
silicons
cb52be5dd9 fixes linter warnings (#14778) 
* woo

* woo
 2021-05-31 10:19:20 -05:00
silicons
caa2dbeefd Update slaughter.dm 2021-05-28 05:51:21 -07:00
silicons
7c1b8ee07d Merge pull request #14757 from Kraseo/no-bloodcrawlies 
fixes being able to slam into people while bloodcrawled as slaughter demon
 2021-05-28 06:50:19 -06:00
Linzolle
ed86a6628a THIS SHOULD REALLY BE THE OTHER WAY AROUND 2021-05-27 19:53:55 -05:00
Linzolle
46833abf0b add cult_permitted area flag 2021-05-27 19:34:00 -05:00
keronshb
e0a1e50927 Fixes the linter 2021-05-27 13:25:27 -04:00
keronshb
8f1db2d5ec Fixes some stuff 
Actually ticks the spell, fixes the brain damage issue, etc.
 2021-05-27 12:16:54 -04:00
Kraseo
c3bfbac89a this time for real 2021-05-26 01:43:45 +02:00
Kraseo
7173bfade5 this is why i don't do webedits 2021-05-26 00:35:49 +02:00
Kraseo
3b5f391843 Merge branch 'master' into no-bloodcrawlies 2021-05-26 00:29:20 +02:00
Kraseo
7e2e608784 fixes slamming people into walls and such while bloodcrawled 
no
 2021-05-26 00:23:11 +02:00
zerothebigboy
36fe3fef76 abuse 2021-05-24 21:40:15 -04:00
silicons
92e019dd56 Merge pull request #14716 from Putnam3145/fix-blacklisting-traits 
Makes species/antag trait blacklist no longer remove ALL traits
 2021-05-22 03:41:57 -06:00
Putnam
e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07:00
Lin
67ea47998c Merge pull request #14738 from Putnam3145/fix-activity-again 
Makes antags actually get activity properly
 2021-05-20 13:33:51 -05:00
keronshb
538efd2d8f Alt Click and Alt Click message 2021-05-19 20:01:11 -04:00
keronshb
88dc0821d1 User gibs when being turned into a spess dragon 2021-05-19 19:49:48 -04:00
Lin
0c77834c56 Merge pull request #14733 from qweq12yt/misc-fixes 
[Fix] Even More bug fixing
 2021-05-19 14:49:00 -05:00
keronshb
f4780d4b5a Correct Raw Prophet recipe 2021-05-19 11:19:12 -04:00
keronshb
547b3d0a0b TP finally works 2021-05-19 11:15:48 -04:00
keronshb
b8b25662ff Couple of fixes, almost ready to go 2021-05-18 22:12:02 -04:00