197 Commits

Author SHA1 Message Date
BongaTheProto dc057a41ad Merge branch 'master' into upstream-merge 2024-04-06 18:51:51 -05:00
Elizabeth Lavenza ccfc08b7a8 Fix attack_hand-related runtimes 2024-04-01 11:33:30 -04:00
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
zerothebigboy 8fc9acabb2 updat e 2022-08-08 15:02:02 -04:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03:00
Cazz 9805224ede adds neo kanji language 2021-10-07 02:53:08 -05:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
keronshb 271047cf9f Ninja Change 2021-09-21 17:42:02 -04:00
zerothebigboy fba4b1966c painful 2021-06-09 18:30:32 -04:00
zerothebigboy 190edf57e8 painful 2021-06-09 18:28:21 -04:00
zerothebigboy d2dbd7572b cyborgs and runtime fixes 2021-05-09 19:09:58 -04:00
zerothebigboy b3c0044edc almost forgot the documentations 2021-05-09 06:21:12 -04:00
zerothebigboy 6d4283ca22 holy fuck hate katanas 2021-05-09 06:12:29 -04:00
zerothebigboy 5b973d6ef4 .......... 2021-05-02 23:36:17 -04:00
zerothebigboy 359c778955 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	code/modules/ninja/suit/ninjaDrainAct.dm
2021-05-02 22:47:39 -04:00
Putnam 4811216f07 Activity tracking; traitor class tweaks 2021-04-13 06:42:32 -07:00
zerothebigboy c64e7ee269 ffffffffff 2021-03-16 19:52:00 -04:00
zeroisthebiggay 24e0b7dc22 revert the nerf maybe 2021-03-01 15:31:19 -05:00
zeroisthebiggay ff9e2281e0 trynna nerf cloak more
trynna nerf cloak more
2021-02-13 16:33:44 -05:00
zerothebigboy d43c7c00f6 conflicts and stealth nerf 2021-02-13 13:51:03 -05:00
zerothebigboy a2a8ab12c6 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum 2021-02-10 20:01:09 -05:00
zerothebigboy ec8029b0cc a couple more fixes 2021-02-10 20:00:04 -05:00
zeroisthebiggay 969ac7e5e4 now no longer wrong
now no longer wrong
2021-02-10 19:01:08 -05:00
zerothebigboy 00d7b0c9c9 Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum 2021-02-10 18:57:05 -05:00
zerothebigboy de2e410c6f a bit more stuff 2021-02-10 18:55:56 -05:00
zeroisthebiggay 73020eba35 information here is wrong
information here is wrong
2021-02-10 14:27:14 -05:00
zerothebigboy 87eb447c10 some final touch ups 2021-02-10 14:22:04 -05:00
zerothebigboy a93e089d2a two hours for aesthetics 2021-02-10 00:12:27 -05:00
zerothebigboy 097666a71a un 2021-02-09 18:49:45 -05:00
zerothebigboy 7d60d27a6f fun 2021-02-09 17:31:24 -05:00
zerothebigboy 85886f563f f 2021-02-08 16:59:54 -05:00
silicons a41e1b1077 Update ninjaDrainAct.dm 2020-12-18 05:00:16 -07:00
silicons 029c755e15 Update ninjaDrainAct.dm 2020-12-16 02:49:37 -07:00
silicons 5b03f5b0ec more 2020-11-12 23:36:18 -07:00
Timothy Teakettle 58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
Timothy Teakettle 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons 33d5ba788b aight 2020-07-24 20:19:18 -07:00
timothyteakettle 8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Timothy Teakettle 4c55e86da7 part 2 2020-06-10 23:14:25 +01:00