Commit Graph

764 Commits

Author SHA1 Message Date
Timothy Teakettle 016d3d39fc emote over holopad 2020-12-13 22:18:54 +00:00
Timothy Teakettle 76fe9c7f4c swap cooldown and cooldown check lines 2020-12-13 02:34:52 +00:00
Timothy Teakettle 866220aefb better cooldown 2020-12-13 02:33:57 +00:00
timothyteakettle 76b291c0b5 action 2020-12-13 01:16:25 +00:00
timothyteakettle 3a017d1173 it works 2020-12-12 01:49:50 +00:00
Timothy Teakettle 99f50addc7 wip 2020-12-11 20:35:37 +00:00
silicons f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
DeltaFire 922129abd2 proc override stuff 2020-11-15 21:12:01 +01:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons 1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
DeltaFire d54a899695 fixes KA modkits being installed in borgs by others
These have been broken for so long holy fuck
2020-10-01 17:13:03 +02:00
silicons 8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
silicons 9fef16964c Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-21 03:13:51 -07:00
Artur 435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
silicons 8ebe765d70 fixes 2020-09-20 02:03:18 -07:00
silicons 1ea0dd9f76 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-19 15:56:13 -07:00
Timothy Teakettle f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
silicons 419eb5ae05 Merge pull request #13360 from KeRSedChaplain/silicon_death_sounds
Silicon death sounds or "Cease shooting the malfunctioning metal doorknob at the tone"
2020-09-07 13:42:31 -07:00
Dan-Neposh db67e6db1f AIs have their own unique sound for death now 2020-09-06 18:02:30 -04:00
Dan-Neposh f4ae266d66 Silicons now have a sound to let you know when your flash spam succeeds 2020-09-06 17:21:52 -04:00
Cameron! e3af0d654e Revert "[READY] DRAKEBORGS & PLUSHIES" 2020-09-02 17:47:22 -07:00
Artur c79e9fbc0b https://github.com/tgstation/tgstation/pull/53263 2020-09-02 18:48:09 +03:00
Artur 3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Timothy Teakettle b3c459c59c okay you can use any emote 2020-08-27 21:04:36 +01:00
Timothy Teakettle 398692df0b emotes 2020-08-27 20:24:37 +01:00
silicons 1b30adbf2a Update robot.dm (#13247) 2020-08-26 14:14:33 +02:00
silicons 8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
Navier fc70d3dde2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG 2020-08-15 23:13:41 -04:00
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Seris02 635a42e102 yeet (#11699) 2020-08-09 15:14:25 +02:00
silicons f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
Letter N 773509719a TGUI-Go for launch 2020-08-09 20:39:04 +08:00
Putnam 9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Letter N 333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Lin ede59e5c4d Merge pull request #13021 from silicons/salt_pr
gives ipcs silicon sound emotes
2020-08-05 19:43:54 -05:00
silicons bbcc36bdec ok 2020-08-03 22:31:31 -07:00
silicons 42db990836 why am i doing this 2020-08-03 13:37:37 -07:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N 0805265412 yet another batch. MAJOR: APC 2020-07-30 12:54:53 +08:00
Timothy Teakettle 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Lin 81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
silicons ffcfd21613 fix 2020-07-27 14:24:10 -07:00
Sishen 04feb3c4a5 borg 2020-07-25 03:22:48 -06:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons db24df58a0 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:36:46 -07:00
silicons ec72015f4f Merge pull request #12809 from BlackMajor/borgo
Gripper brained. The medborg can do chemistry now, oh no.
2020-07-23 10:35:16 -07:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons 184e3992f3 fixes 2020-07-21 11:56:23 -07:00
Timothy Teakettle 75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
silicons 416b989e12 changes 2020-07-20 11:35:10 -07:00