Commit Graph

17074 Commits

Author SHA1 Message Date
Fox-McCloud efa01b525a Merge pull request #158 from Markolie/master
Major map overhaul, remove customs officer/nanotrasen recruiter
2015-01-11 20:31:19 -05:00
Markolie 60e18d0c0e Major map overhaul, remove customs officer/nanotrasen recruiter 2015-01-12 02:23:45 +01:00
tkdrg 82a1a16b38 Fixes XSS vuln in changeling mimic voice
Report and picture by HoaxIT/ERIKHANSON
See https://github.com/tgstation/-tg-station/issues/6975
2015-01-11 20:10:37 -03:00
Bone-White f8302889d4 Merge pull request #1 from ParadiseSS13/master
Downstream merge
2015-01-11 17:36:57 +00:00
Bone White ec8f90efd9 Air Alarms now deconstructable
They also update to the correct area when constructed, and the runtime
errors (which I'm assuming were why deconstructing them was disabled)
have been fixed.
2015-01-11 11:18:58 +00:00
Bone White 17e0193b9e Cult hud on deconversion fix
Fixes the long-standing bug which meant that a client's icon over their
mob was not removed when deconverted, leading to mass confusion.
2015-01-11 09:02:28 +00:00
Markolie 042ac20d5e Remaining 3 /tg/ away missions 2015-01-11 07:41:12 +01:00
Markolie fc7f00baba Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-01-11 06:05:25 +01:00
Markolie ca902cbede Curtains 2015-01-11 05:49:47 +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 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