Commit Graph

14558 Commits

Author SHA1 Message Date
Markolie
04ab12bdb3 Fix alien observer picking 2015-01-10 23:44:53 +01:00
Markolie
31fa043343 Not sure why I included this file, removing 2015-01-10 07:39:37 +01:00
Markolie
8867fa3f78 Blank PDA fix 2015-01-10 07:38:24 +01:00
Markolie
fe51af3775 Malf end of round spam fix 2015-01-10 06:45:23 +01:00
Markolie
ae54430e6a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2015-01-10 06:24:55 +01:00
Markolie
ced499edc3 Vox Heist port from Bay 2015-01-10 06:21:21 +01:00
Fox-McCloud
bd2a59c9c2 Merge pull request #147 from Fox-McCloud/Movement-Speed-Tweaks
Movement speed tweaks
2015-01-09 23:02:56 -05:00
Fox-McCloud
9f24f8efd6 Movement Speed 2015-01-09 22:26:21 -05:00
DZD
e7e1a77e1f Space Pod Taser Change
Changes the instantstun electrode from the space pod tasers to the
disabler beam, this will allow them to shoot through windows and kill
the NPC mobs they find in space.
2015-01-09 18:26:27 -05:00
DZD
95fe57f08b Undo Possible Language Fix
Language Fix does not work, removing for now, to be fixed in a separate
PR.
2015-01-09 18:08:43 -05:00
DZD
fba0657487 Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port 2015-01-09 17:47:05 -05:00
Fox-McCloud
7e37b4d151 Merge pull request #145 from Markolie/master
Compile fix
2015-01-09 16:07:18 -05:00
Markolie
bd80867ef5 Compile fix 2015-01-09 22:06:13 +01:00
Fox-McCloud
6b4f195d62 Merge pull request #144 from Bone-White/master
Fedora tip fix
2015-01-09 08:12:27 -05:00
Fox-McCloud
cb342a488b Merge pull request #139 from Markolie/master
Bug fixes, away mission port from /tg/
2015-01-09 08:07:41 -05:00
Bone White
15febb3e7f Fedora tip fix
now shows to visible players
2015-01-09 07:24:57 +00:00
Markolie
c65c9c8a7a Minor R&D changes, defib/IPC fix attempt 999 2015-01-09 05:37:21 +01:00
Fox-McCloud
3184c2a988 Ballistics Crate 2015-01-08 21:25:40 -05:00
Fox-McCloud
96a89b4591 Bandolier 2015-01-08 21:20:51 -05:00
Markolie
29f5bd1b2f Arrival comma fix 2015-01-09 00:29:57 +01:00
Markolie
c70a6c172b Away mission port from /tg/ 2015-01-09 00:12:16 +01:00
Markolie
c4da1e66d9 Fix wall smoothing 2015-01-08 19:44:56 +01:00
Fox-McCloud
81a4bfed43 Security Clothing 2015-01-07 23:11:52 -05:00
Markolie
2757f98f71 Vox access fix 2015-01-08 03:44:15 +01:00
Markolie
2677fd587e Bug fixes 2015-01-08 02:16:09 +01:00
DZD
7239fc2c40 Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port 2015-01-07 15:48:29 -05:00
Markolie
f6e95aebc2 Prioritize station destruction over xenos exterminated 2015-01-07 04:30:33 +01:00
Markolie
d593679a22 Fix the library 2015-01-07 03:17:17 +01:00
Markolie
f206d91932 Add example config files 2015-01-07 02:46:55 +01:00
Markolie
a7ef8417cd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2015-01-06 23:56:35 +01:00
Markolie
c1b48b40b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/modules/client/preferences.dm
2015-01-06 23:40:34 +01:00
Fox-McCloud
d93e627d45 Detectivcurity 2015-01-06 17:39:57 -05:00
Markolie
3f8c04686d Vox trader changes 2015-01-06 23:36:26 +01:00
Markolie
2e37a88639 More verb fixes 2015-01-06 22:46:11 +01:00
Markolie
0284c9ce87 And revert the old changes 2015-01-06 22:08:36 +01:00
Markolie
faf90c3fdc Proper drone solution (I shouldn't code at late night) 2015-01-06 22:07:42 +01:00
Markolie
0bf809eae4 Let observers join as drones instantly 2015-01-06 06:47:13 +01:00
Fox-McCloud
b90b9ad8b5 Merge pull request #131 from Markolie/master
Map fixes, bug fixes
2015-01-05 22:57:19 -05:00
Fox-McCloud
f735fb3d5e Merge pull request #121 from PJB3005/AZERTY
more advanced hotkey mode system + AZERTY hotkey mode
2015-01-05 22:57:10 -05:00
Fox-McCloud
d70cda53e2 Merge pull request #87 from PJB3005/voxmasterrace
Old vox choice
2015-01-05 22:57:03 -05:00
Markolie
bb2ce97fd8 Paper bundle ash fix 2015-01-06 02:18:25 +01:00
Markolie
1f54e93239 Burnable photo, burn ash location fix 2015-01-06 02:17:14 +01:00
Markolie
6ce5b379e4 Let AI transmit cryo/arrival messages when present, let AI change arrival message 2015-01-06 02:06:23 +01:00
Markolie
73bf2003c3 Armory mechnical toolbox update 2015-01-06 00:45:02 +01:00
Markolie
4cca604423 Sechud for magistrate, armory inventory paper update 2015-01-06 00:01:20 +01:00
Fox-McCloud
03c7a72a33 Undershirts 2015-01-05 16:22:47 -05:00
Markolie
91cd9eb0b0 Supply display fix 2015-01-05 21:25:47 +01:00
Markolie
92b57b5189 Bug fixes, R&D design files, map fixes 2015-01-05 21:03:48 +01:00
Fox-McCloud
e23841c46f Rebalance Stamina 2015-01-05 06:53:48 -05:00
Fox-McCloud
47b6e2d109 Oops 2015-01-02 22:02:56 -05:00