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

5220 Commits

Author SHA1 Message Date
silicons
08f251a88c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-27 10:44:51 -07:00
Lin
3a82712cf9 Merge pull request #14881 from Citadel-Station-13/silicons-patch-42 
fixes silicon examine
 2021-06-23 09:50:11 -07:00
silicons
0dd8c03286 Update examine.dm 2021-06-21 17:43:05 -07:00
DeltaFire
c7a098da06 suffering (aka, a bunch of fixes) 2021-06-21 19:05:31 +02: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
4768b23398 Merge pull request #14860 from Arturlang/nanite_updates 
Updates our nanite stuff to TG's, mostly
 2021-06-18 20:01:05 -07:00
Artur
5619b73e6b Makes it actually, actually work 2021-06-16 02:02:28 +03:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
silicons
66dde6f9ea woo 2021-06-14 14:00:02 -07:00
silicons
01e0fa16fe it works. 2021-06-14 13:52:48 -07:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
silicons
8224546cfc ok 2021-06-13 15:36:20 -07:00
silicons
e7f5f80fb1 yelling 2021-06-13 15:34:47 -07:00
silicons
e84f7ae4ac fix 2021-06-13 01:16:44 -07:00
silicons
b6bb20842f Yelling works 2021-06-13 00:50:00 -07:00
Timothy Teakettle
baad78e7fe bee 2021-06-11 16:08:55 +01:00
silicons
5e4f3ed694 Merge pull request #14683 from keronshb/shovedisarmgun 
Off Balance Disarms only if shoved into a wall or person.
 2021-06-09 12:14:37 -07:00
silicons
09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon 
New Challenger: The Cat Surgeon has appeared! (Ready!)
 2021-06-09 11:29:24 -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
c0e3b8d5ef Merge pull request #14809 from SandPoot/speak-nice-yes 
Centralizes borg speech and uses some of the icons for the typing indicator
 2021-06-09 11:15:01 -07:00
SandPoot
b0940456f5 upload files 2021-06-08 13:13:22 -03: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
silicons
d67c4d9fa8 hacky 2021-06-07 16:45:51 -07:00
silicons
2d763a9ab3 auto 2021-06-07 16:37:19 -07:00
keronshb
40f9941849 Fixes invisibility when being dragged and glass table cheese 2021-06-04 22:52:03 -04:00
DeltaFire
b2e2c49011 plasmamen & golems 2021-06-02 17:47:57 +02:00
DeltaFire
0f01a4a7da huh 2021-06-01 22:52:39 +02:00
DeltaFire
dd33371a3b colors 2021-06-01 22:48:57 +02:00
keronshb
70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
WanderingFox95
df0e1057d1 Imagine this crazy person became a threat suddenly 2021-05-30 21:15:44 +02:00
keronshb
7dbab19597 Fixes the linters and adds a proper async 2021-05-27 00:14:43 -04:00
keronshb
78db6bd5c2 Ports Floor Cluwnes 
Oh fuck oh god
 2021-05-26 21:58:35 -04:00
silicons
eba3f554bc Merge pull request #14737 from zeroisthebiggay/KILL 
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
 2021-05-23 08:52:25 -06: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
silicons
e1a800ff49 Merge pull request #14742 from keronshb/specialhudport 
(READY) Ports Special Hud icons for some simple mobs
 2021-05-22 01:37:59 -06:00
keronshb
88dc0821d1 User gibs when being turned into a spess dragon 2021-05-19 19:49:48 -04:00
keronshb
1d843cc72f Part 3 - the missing stuff 2021-05-19 19:19:35 -04:00
keronshb
a15637a929 Part 1 of Health Bars for Space Dragon 2021-05-19 19:18:19 -04:00
keronshb
a6e157ba73 IT WORKS!! 2021-05-19 19:03:21 -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
zerothebigboy
bc61ada440 KILL 2021-05-19 13:24:40 -04:00
keronshb
60965939d6 bigger mobs have some special health bars (#49104) 
* cool beans

* more, more!

* smol fix
 2021-05-19 11:59:50 -04:00
keronshb
b8b25662ff Couple of fixes, almost ready to go 2021-05-18 22:12:02 -04:00
Putnam
030361e1cc suggestions 2021-05-18 16:18:57 -07:00
keronshb
d2f69acaf8 Space Dragon Event 
Ports the Space Dragon event
 2021-05-18 12:06:32 -04:00
qweq12yt
ba20b5b8aa fix emag shuttle order 2021-05-17 18:48:01 -03:00
qweq12yt
9dd372ed11 fix void cloak going to the void 2021-05-17 17:33:23 -03: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
Ghom
0b06957dc7 Space Dragons are now actually capable of flight. (#57428) 
* Space Dragons are now actually capable of flight.

* Gives them the tag so the flying animation doesn't apply, it looks like shit without this
 2021-05-14 12:33:11 -04:00