Commit Graph

6557 Commits

Author SHA1 Message Date
Ghommie 7d5725e450 a dot 2020-01-24 02:31:46 +01:00
Ghommie 78934c52fe A handful of runtime fixes. 2020-01-24 02:27:06 +01:00
kevinz000 4304a7dd42 Merge pull request #10602 from Ghommie/Ghommie-cit509
RPD ventcrawler escapism sanity check.
2020-01-23 04:47:46 -07:00
kevinz000 1b7265d8c1 Merge pull request #10605 from r4d6/Layer
Port TG Layers updates and Freezer update
2020-01-23 04:46:52 -07:00
kevinz000 88f625edfc Merge pull request #10636 from Ghommie/Ghommie-cit512
Trilby's solar panels PR but improved.
2020-01-23 04:35:13 -07:00
Ghom 047059617c Merge pull request #10645 from r4d6/Modular-Lavaland
Modularize the mining base
2020-01-23 02:53:34 +01:00
Ghom 04811c9c22 Merge pull request #10450 from Citadel-Station-13/kevinz000-patch-8
(is this really a good idea) hitscan emitters
2020-01-23 02:44:17 +01:00
r4d6 e3cb379bde Add the Mining Base as a submap 2020-01-21 20:31:40 -05:00
kevinz000 8f60d01208 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8 2020-01-20 22:47:21 -07:00
Ghom c244f95ed9 Merge pull request #10588 from PersianXerxes/tweakEngieField
Reduces Forcefield Projector Range to Two Tiles
2020-01-21 02:17:38 +01:00
kevinz000 5abc1104c0 ok 2020-01-20 18:03:54 -07:00
kevinz000 221e05b3c8 add line 2020-01-20 17:58:58 -07:00
kevinz000 bb14b255d2 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-12 2020-01-20 17:51:56 -07:00
Ghommie c93f16e4d4 Unused variable. 2020-01-21 00:45:51 +01:00
Ghommie ddf037da92 Trilby's solar panels PR but improved. 2020-01-21 00:28:41 +01:00
kevinz000 0661bc2558 Update PDA.dm 2020-01-20 15:26:24 -07:00
Ghom 4c6af66050 Merge pull request #10617 from Citadel-Station-13/kevinz000-patch-16
Grenades can now actually have their timers adjusted
2020-01-20 20:02:06 +01:00
kevinz000 051ca8c050 checks 2020-01-20 03:45:40 -07: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
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
Putnam cc1fcee4ac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak 2020-01-19 03:56:41 -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
Ghom 5a613809f5 Merge pull request #10599 from Putnam3145/gibtonite-explosion-fix
Fixed gibtonite instantly exploding on pick mining
2020-01-18 16:54:52 +01:00
Putnam b30948a60a Fixed gibtonite instantly exploding on pick mining 2020-01-18 04:37:44 -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
Persi 4d4f3b32b3 Making forcefield projectors less stupid 2020-01-16 22:59:19 -05: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