Commit Graph

5039 Commits

Author SHA1 Message Date
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
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
Markolie bd80867ef5 Compile fix 2015-01-09 22:06:13 +01: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 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 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
Markolie 6ce5b379e4 Let AI transmit cryo/arrival messages when present, let AI change arrival message 2015-01-06 02:06:23 +01:00
Fox-McCloud 03c7a72a33 Undershirts 2015-01-05 16:22:47 -05:00
Fox-McCloud ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Fox-McCloud 43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Fox-McCloud a92921786f Clothing Update 2015-01-01 11:23:48 -05:00
Fox-McCloud a90a217290 Xeno Rebalance 2014-12-31 11:16:11 -05:00
Fox-McCloud 525bb1a96f Stun Changes 2014-12-30 12:30:14 -05:00
Fox-McCloud ff186408ed Malf AI update 2014-12-24 21:23:04 -05:00
Markolie 10a2cda23c Another attempted defib fix 2014-12-24 15:03:56 +01:00
Markolie 78d302614c Antaghud posibrain fix 2014-12-24 14:26:37 +01:00
Markolie 5bb4a3b1fe Minor changes 2014-12-24 13:13:49 +01:00
Markolie b8332f1e6e Additional autopsy data 2014-12-24 01:29:08 +01:00
Markolie 328fb13704 Attempted defib fix 2014-12-23 17:25:09 +01:00
Markolie 37fba799d6 Radio pain message fix 2014-12-23 01:23:53 +01:00
Markolie c8db120dce Transit tube pressure fix 2014-12-22 20:31:03 +01:00
Markolie 71a9a358e1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2014-12-22 15:14:35 +01:00
Markolie 47f4161fbb Bug fixes, map fixes 2014-12-22 14:47:58 +01:00
Fox-McCloud 03c61ed3ab Foxes 2014-12-22 08:32:32 -05:00
Markolie d440784473 Syndicat faction 2014-12-21 20:41:56 +01:00
Markolie 17ae62bc99 Karma refund option, IPC radiation checks 2014-12-20 20:45:31 +01:00
Markolie da8115dc2e Bug fixes 2014-12-20 16:27:33 +01:00
Markolie 2c79a2f376 Bot fix, add emergency door access 2014-12-19 00:32:32 +01:00
Markolie 50a176571a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2014-12-18 17:13:18 +01:00
Fox-McCloud 53d15682ce Melee Rebalancing 2014-12-18 10:22:02 -05:00
Markolie 19fde1c4a0 Bug fixes 2014-12-17 21:56:37 +01:00
Fox-McCloud 84b9f05149 Xeno Tweaking 2014-12-16 20:26:27 -05:00
Fox-McCloud fff011e334 Merge pull request #84 from SamCroswell/master
Buzzsky Icon, Pingsky Hates Humans
2014-12-16 10:24:19 -05:00
SamCroswell 56f22dbf2d Buzzsky Icon, Pingsky Hates Humans
Buzzsky now gets an icon that reflects his sorry state, Pingsky now has
anti-human sentiment.
2014-12-15 20:25:00 -05:00
Markolie 18cd40308d Alien notice fixes 2014-12-15 17:13:08 +01:00
Markolie ad726006a3 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2014-12-15 12:05:10 +01:00