Commit Graph

4364 Commits

Author SHA1 Message Date
Seris02 47d1f46172 fixes and stuff 2020-01-19 15:53:32 +08:00
Seris02 f54417f99e fixes 2020-01-19 15:50:48 +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 6500d0d9a9 Fixes ghost role descriptions 2020-01-16 13:43:21 +02: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
kevinz000 1d184b8cad s 2020-01-16 00:21:21 -07:00
kevinz000 26525b8fa7 s 2020-01-16 00:14:03 -07:00
kevinz000 1acac87da3 compile 2020-01-15 23:54:30 -07:00
Tupinambis dd9e62c8bb Sillycon law prevention clause removal. 2020-01-15 23:15:18 -06:00
kevinz000 02841f8e92 compile 2020-01-15 18:49:37 -07:00
r4d6 755b0fac3c Merge branch 'master' into Passive-Vents 2020-01-15 19:15:50 -05:00
r4d6 6045d818d8 Add passive vents 2020-01-15 19:12:13 -05:00
Artur 8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Ghom 8a06f2f45c Merge pull request #10499 from Hatterhat/tg-40046
more /tg/station ports - tools! logging! some other fun stuff!
2020-01-15 01:05:36 +01:00
Ghom 5dee355381 Merge pull request #10530 from kappa-sama/modularer
deletes modular items but this time i don't get cucked
2020-01-15 00:47:38 +01:00
Putnam 21dde64da2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into chemistry-aaa 2020-01-14 03:27:03 -08:00
Hatterhat 464b893790 Merge branch 'master' into tg-40046 2020-01-13 23:06:48 -06:00
Ghommie 1d948907f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-13 23:26:21 +01:00
kappa-sama 3f57f30e14 Merge branch 'master' into modularer 2020-01-13 16:32:00 -05:00
Lin 623ab1c661 Merge pull request #10287 from Ghommie/Ghommie-cit492
Minor captains closet cleanup.
2020-01-13 21:15:42 +00:00
TrilbySpaceClone 04eab97058 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware 2020-01-13 11:54:14 -05:00
Letter N 6ace5fc4b3 ell eff 2020-01-13 21:19:21 +08:00
Letter N 450cb2b01a Merge branch 'master' into banjo 2020-01-13 20:53:30 +08:00