Commit Graph

3278 Commits

Author SHA1 Message Date
Artur 8b21a60ac9 MF Line endings 2020-01-20 14:09:22 +02:00
Artur f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
kevinz000 051ca8c050 checks 2020-01-20 03:45:40 -07:00
kevinz000 1a0e7de4c2 s 2020-01-20 01:30:20 -07:00
Seris02 a100f9382e better, there, happy now github 2020-01-20 14:51:53 +08:00
kevinz000 ecddef2f21 compile 2020-01-19 22:58:08 -07:00
kevinz000 0b10b8cf89 Update code/game/objects/items/devices/PDA/PDA.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-01-19 22:41:19 -07:00
Seris02 5524b0fa03 yes. 2020-01-20 13:00:24 +08:00
Seris02 8da447c678 start of stealthmode 2020-01-20 09:51:17 +08:00
kevinz000 f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
kevinz000 b1cd0f4ede Update grenade.dm 2020-01-19 16:11:49 -07:00
kevinz000 088e586b47 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-01-19 16:10:56 -07:00
kevinz000 374f4f143e Update PDA.dm 2020-01-19 13:45:16 -07:00
kevinz000 90fcedd188 Update grenade.dm 2020-01-19 13:40:09 -07:00
Ghom 536900a7ac Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
2020-01-19 16:37:40 +01:00
Seris02 45b844c231 more fixes + code improvements 2020-01-19 16:48:19 +08:00
Seris02 afe7c15645 merge fixes 2020-01-19 16:40:45 +08:00
Seris02 fd49c1302b woops 2020-01-19 15:55:24 +08:00
Seris02 47d1f46172 fixes and stuff 2020-01-19 15:53:32 +08:00
Seris02 f54417f99e fixes 2020-01-19 15:50:48 +08:00
Seris02 718ff58e0b fixes + advanced injectors 2020-01-19 15:17:57 +08:00
Hatterhat 590d71ddc1 hey ghom i fixed it i think 2020-01-18 23:35:52 -06:00
kevinz000 72e2961972 Update PDA.dm 2020-01-18 21:34:24 -07:00
kevinz000 9619a6bf5d Update PDA.dm 2020-01-18 19:37:12 -07:00
kevinz000 7b8cb0dbfc Update PDA.dm 2020-01-18 19:33:22 -07:00
kevinz000 bc18ba314a Update PDA.dm 2020-01-18 19:21:47 -07:00
r4d6 5084146400 Port 2020-01-18 18:46:22 -05:00
Ghommie 3ee855ab77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 22:14:06 +01:00
r4d6 810556cbb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents 2020-01-18 16:03:49 -05:00
Ghom d709edb1c2 Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
Ghom ce2fc37df3 Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
2020-01-18 20:16:30 +01:00
Ghommie a2e1c8ecf1 GLOB. 2020-01-18 18:45:20 +01:00
Ghommie 47b031dad2 Update. 2020-01-18 18:40:13 +01:00
Ghommie 82b65f13f4 RPD anti-ventcrawler escapist sanity check. 2020-01-18 18:23:54 +01:00
Ghom 07b3bac674 Merge pull request #10580 from Putnam3145/craft-log
Craft logging
2020-01-18 17:47:31 +01:00
Ghom c00be1a9b1 Merge pull request #10586 from Tupinambis/RLDNerf
Nerfs RLDs because they hard counter nightmares and night ops.
2020-01-18 17:42:30 +01:00
Seris02 fdf3871cb7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-18 18:30:51 +08:00
Seris02 04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
Putnam 3788bc6676 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos 2020-01-17 21:33:13 -08:00
Ghommie 9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
kevinz000 aea0de30d1 Merge pull request #10125 from Ghommie/Ghommie-cit449
Ports a few projectile code updates by ke:b:inz.
2020-01-17 15:15:08 -07:00
Tupinambis 22dbd3d265 Nerfs RLDs in general. You know I had to do it to em. 2020-01-17 12:23:13 -06:00
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
Persi 4d4f3b32b3 Making forcefield projectors less stupid 2020-01-16 22:59:19 -05:00
kevinz000 9ef4cbfa76 refactor tags 2020-01-16 20:58:00 -07:00
Putnam 5ace1df9af better logging, that also works 2020-01-16 19:09:13 -08:00
Putnam a4cc73f219 some craft logging 2020-01-16 18:40:00 -08:00
r4d6 ce16c91b2f Code changes 2020-01-16 14:08:14 -05:00
Artur 472d18403c Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties 2020-01-16 11:38:09 +02:00
kevinz000 b22e1a1cb4 compile 2020-01-16 02:27:35 -07:00