cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,177 Commits 26 Branches 2 Tags
b3075f07042be591527ac05484dbaec00dba0b43
Commit Graph

8415 Commits

Author SHA1 Message Date
Markolie
b3075f0704 Simplify and cleanup IPC/defib revival after messy fixes 2015-01-13 17:33:46 +01:00
Markolie
548ad9a5ca Defib/IPC fix? 2015-01-13 02:48:42 +01:00
Markolie
9986c03acb Bluespace anomaly fix 2015-01-13 02:18:35 +01:00
Markolie
8163056147 Let drained robots move 2015-01-13 01:44:03 +01:00
Markolie
5dff15fd56 Remove AI intercept from spam event 2015-01-12 20:44:03 +01:00
Markolie
d1eadab31c Away mission fix 2015-01-12 04:29:53 +01:00
Markolie
60e18d0c0e Major map overhaul, remove customs officer/nanotrasen recruiter 2015-01-12 02:23:45 +01:00
Markolie
fc7f00baba Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-01-11 06:05:25 +01:00
Markolie
c5696683ad Ventcrawl fix 2015-01-11 05:47:09 +01:00
Fox-McCloud
be1d527069 Borg Modules 2015-01-10 21:41:41 -05:00
DZD
29d572ee23 Kitchen Food Processor Nerfs 
- The cereal maker, deep fryer, and the grill can only process food
items instead of almost anything.
- Deep frying and cerealizing food add 3 nutriment from 30.
- Ice cream cones have a reagent storage volume of 50 from 300.
 2015-01-10 20:14:07 -05:00
Fox-McCloud
1e1e0b88c1 Merge pull request #150 from Markolie/master 
Fix alien observer picking
 2015-01-10 17:47:07 -05:00
Markolie
04ab12bdb3 Fix alien observer picking 2015-01-10 23:44:53 +01:00
Fox-McCloud
e8bda25149 Merge pull request #148 from Markolie/master 
Vox Heist port from Bay, bug fixes
 2015-01-10 14:43:48 -05:00
Fox-McCloud
2e573ff10e Merge pull request #149 from SamCroswell/master 
Ninja Nerfs
 2015-01-10 13:59:33 -05:00
SamCroswell
3b7e95ba5f Ninja Nerfs 2015-01-10 13:50:44 -05:00
Markolie
31fa043343 Not sure why I included this file, removing 2015-01-10 07:39:37 +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
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
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
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
c1b48b40b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/modules/client/preferences.dm
 2015-01-06 23:40:34 +01: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