Commit Graph

3707 Commits

Author SHA1 Message Date
Markolie
60e18d0c0e Major map overhaul, remove customs officer/nanotrasen recruiter 2015-01-12 02:23:45 +01:00
Markolie
042ac20d5e Remaining 3 /tg/ away missions 2015-01-11 07:41:12 +01:00
Markolie
ca902cbede Curtains 2015-01-11 05:49:47 +01:00
Markolie
8867fa3f78 Blank PDA fix 2015-01-10 07:38:24 +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
DZD
fba0657487 Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port 2015-01-09 17:47:05 -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
Fox-McCloud
96a89b4591 Bandolier 2015-01-08 21:20:51 -05: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
DZD
7239fc2c40 Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port 2015-01-07 15:48:29 -05:00
Markolie
2e37a88639 More verb fixes 2015-01-06 22:46:11 +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
Fox-McCloud
e23841c46f Rebalance Stamina 2015-01-05 06:53:48 -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
525bb1a96f Stun Changes 2014-12-30 12:30:14 -05:00
Markolie
54f1f1c14f First aid kit name fixes 2014-12-24 14:33:00 +01:00
Markolie
2f8be5a6cc Typo fix 2014-12-24 13:56:43 +01:00
Markolie
f03bbf8bc6 Bug fixes 2014-12-24 12:53:49 +01:00
Markolie
328fb13704 Attempted defib fix 2014-12-23 17:25:09 +01:00
Markolie
0027425ab9 Consistency in ERT equipment, give ERT PDA's so they can be messaged privately 2014-12-23 02:36:40 +01:00
Markolie
c8db120dce Transit tube pressure fix 2014-12-22 20:31:03 +01:00
Markolie
266b4cb113 R&D UI rework 2014-12-22 17:38:22 +01:00
Fox-McCloud
03c61ed3ab Foxes 2014-12-22 08:32:32 -05:00
Markolie
8a63f79e54 Sparks will now disappear properly 2014-12-22 00:15:58 +01:00
SamCroswell
31dbe4c9e5 Merge Conflict Fix? 2014-12-20 20:11:41 -05:00
Markolie
17ae62bc99 Karma refund option, IPC radiation checks 2014-12-20 20:45:31 +01:00
SamCroswell
52a7313670 Minor Hand Tele Change, Depot Change
- The Hand tele's random mode will not not select turfs inside of an
area tagged to be immune to telescience. If there is a beacon there,
however, it can still be targeted with a large teleporter and then
relayed with the hand teleporter.

- The Syndicate depot is now surrounded by asteroid on almost every
side, and a large majority of the turrets on the outside have been
removed. There  have been two additional turrets added to the interior,
and there are now two exterior turrets at the end of the cave that leads
to the airlock. This is in response to player feedback, as they thought
that the turrets covering every angle of approach was detrimental due to
people who were floating by without knowing what was ahead were getting
shot and killed. This new design is still secure, but players will be
able to more easily go around the turrets if they do not wish to attempt
to break in.
2014-12-20 12:01:00 -05:00
Markolie
da8115dc2e Bug fixes 2014-12-20 16:27:33 +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
Fox-McCloud
5d416041c2 Merge pull request #92 from FalseIncarnate/master
Assorted Fixes / Changes
2014-12-18 03:20:13 -05:00
FalseIncarnate
8a5a9b0242 Assorted Fixes / Changes
Hydroponics trays can now be sprayed with any spray container (Space
Cleaner bottles, Chemsprayers, Plant-B-Gone bottles, etc) and will
correctly transfer the actual reagents to the tray and remove them from
the container.

Repairing robotic limbs with a welder will no longer cause eye damage.
This will allow medical to repair IPCs and prosthetic limbs again
without needing a welding mask/goggles. May also extend to fixing up
borgs with a welder too. The sounds and other recent IPC changes are
unaffected.

Anyone injected with Slime Toxin, the special reagent from Green Slime
Extract, will now receive some messages explaining their new form.
Should hopefully avoid confusion regarding Shadow People and the
previously unexplained damage they were receiving. At this time, the
dark sight for Shadow People is likely still not functioning properly,
and will hopefully be improved in the near future.
2014-12-18 03:14:56 -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
cd156062e8 Ooops 2014-12-15 20:12:51 -05:00
Fox-McCloud
871666156b Icon Fixes 2014-12-15 19:05:13 -05:00
Markolie
ad726006a3 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2014-12-15 12:05:10 +01:00
Markolie
e648bb959e Alien bugfixes 2014-12-15 12:04:30 +01:00
Fox-McCloud
b9dc61b225 forgot this 2014-12-15 05:18:24 -05:00
Fox-McCloud
8cec4742d0 Defib Unit 2014-12-15 04:55:02 -05:00
DZD
8f92593e4a Fixed pAI Death and Interface While in Drone Form
- pAI interface now closes when a user tries to interact with it while
the pAI is in drone form or out of range.
- PROPERLY fixed drone pAI death, leaves a corpse on the ground.
2014-12-14 15:31:30 -05:00
Fox-McCloud
fece84d974 Fixes-Tweakes 2014-12-14 03:18:10 -05:00
Markolie
cd7f08cf31 More changes 2014-12-14 02:54:08 +01:00
Markolie
b803482b52 More access changes 2014-12-14 02:38:25 +01:00
Markolie
a70c06b7b7 Welding closet 2014-12-14 02:10:12 +01:00