741 Commits

Author SHA1 Message Date
Seris02 718ff58e0b fixes + advanced injectors 2020-01-19 15:17:57 +08:00
Seris02 04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000 45c92bcb6f s 2020-01-15 19:07:47 -07:00
Artur 8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Seris02 16b5c83a3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-13 12:53:52 +08:00
Hatterhat 9aedc62ddb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920 2020-01-12 12:39:17 -06:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Seris02 11676f9e79 fixed again 2020-01-11 15:23:59 +08:00
Seris02 18d234178b fixed again 2020-01-11 14:40:02 +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
Hatterhat 080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06:00
kevinz000 24c1baddd0 compile compile compile 2020-01-10 05:50:19 -08:00
kevinz000 5b2c4deaa0 lockcharge --> locked_down 2020-01-07 12:04:41 -08:00
kevinz000 7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Seris02 862acf2f06 ports hyper's genetics 2019-12-28 21:33:15 +08:00
Ghommie 21cfb2914b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-27 17:49:59 +01:00
Ghommie b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Seris02 8ed4fe9c05 changes 2019-12-27 18:09:30 +08:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghom 9d00072072 Merge pull request #10257 from DeltaFire15/communication-magicnumbad
Removes a magicnumber
2019-12-21 15:33:27 +01:00
DeltaFire 3738156340 Magic number baaad 2019-12-21 15:16:28 +01:00
Ghom 71d0c3e257 Merge pull request #10232 from DeltaFire15/cc-headmessages
All heads of staff can now spam CC.
2019-12-21 11:27:04 +01:00
DeltaFire 685425ed55 Atomises out the magicnumber change 2019-12-20 15:26:16 +01:00
DeltaFire e546a59214 Magic number man bad, also all heads can spam CC now 2019-12-18 19:29:35 +01:00
Lin 9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
Ghommie 414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
kevinz000 83ab577a6a Update launchpad_control.dm 2019-12-08 07:30:05 -07:00
kevinz000 2d9c6e64c5 Update launchpad_control.dm 2019-12-06 19:55:54 -07:00
Ghommie 3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Putnam3145 09897b4ece Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her
Ports AI console focus loss fix and fixes an error in my trimline code
2019-11-28 05:37:36 -08:00
Dap 281ddf73ba Ports AI console focus loss fix and fixes an error in my trimline code
Port of https://github.com/tgstation/tgstation/pull/44207 and I copy pasted code and missed renaming one thing.
2019-11-25 14:48:26 -07:00
BlackMajor c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Lin 592dcdb6fd Merge pull request #9896 from Ghommie/Ghommie-cit386
Fixing cyborg camera interaction for real
2019-11-23 05:52:11 +00:00
Ghommie 2e55495557 ayy 2019-11-21 04:48:42 +01:00
Ghommie 399a5080da Fixing cyborg camera interaction for real 2019-11-21 04:42:49 +01:00
kevinz000 34a8dc5962 Merge pull request #9850 from Ghommie/Ghommie-cit368
fixing a few minor issues with console frames building.
2019-11-19 21:38:58 -07:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie bd41cfbfc5 fixing a few minor issues with console frames building. 2019-11-17 22:44:37 +01:00
Ghommie 613605e0d0 Unborking id consoles. 2019-11-16 17:49:12 +01:00
DeltaFire15 9f8547d42d Another sync (#4)
AAAAAAAAA
2019-11-16 16:12:12 +01:00
kevinz000 21775ad3ee Merge pull request #9813 from Ghommie/Ghommie-cit355
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
2019-11-16 01:24:58 -07:00
Ghommie c20bc123ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336 2019-11-15 01:10:39 +01:00
kevinz000 02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
kevinz000 2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
kevinz000 dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
2019-11-14 15:44:59 -07:00
Ghommie 98bc6d6c60 Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]" 2019-11-14 23:33:37 +01:00
Ghommie 63da5ffb13 ID console fixes and other tweaks. 2019-11-11 17:10:14 +01:00
Ghommie e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
Ghommie 1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00