Commit Graph

2511 Commits

Author SHA1 Message Date
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
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
871666156b Icon Fixes 2014-12-15 19:05:13 -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
38e709e4bd Telescience crystal revert, supervisor access/PDA/headset fixes 2014-12-14 00:46:46 +01:00
Fox-McCloud
8238638283 Gun Harmonization 2014-12-13 11:18:56 -05:00
Markolie
e31886016b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/objects/structures/window.dm
2014-12-13 02:15:05 +01:00
Markolie
37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
Fox-McCloud
1b4cd99491 Merge pull request #64 from Fox-McCloud/Stamina
Stamina
2014-12-12 08:19:39 -05:00
Fox-McCloud
e76c8f26f3 Stamina 2014-12-12 06:52:20 -05:00
Markolie
c55c74207d Telescience port from /tg/ 2014-12-11 17:10:40 +01:00
Markolie
46a061e722 Bug fixes 2014-12-11 15:20:45 +01:00
DZD
7d600c4379 Minor Fixes
- Fixes message spam a pAI gets if being dragged.
- pAI master interface should become inaccessible if pAI goes into drone
form.
- Minor changes to pAI death, handles the card a bit better.
2014-12-10 17:35:50 -05:00
DZD
9a5195cb3e Upstream Sync
Syncs with ParadiseSS13/Paradise and fixes merge conflicts.
2014-12-09 22:55:08 -05:00
Markolie
7359061678 Bug fixes 2014-12-10 04:47:24 +01:00
DZD
55a2779cf8 More Minor pAI Tweaks
- EMPs will only instantly kill full health pAIs on a 20% chance,
possible brute/burn from EMPs isn't instantly deadly anymore.
- pAIs can no longer bump things around.
- Cleans up unneeded if statement in pAI pull proc, still cannot pull
anything.
- pAI card (not mobile form) now properly reacts to explosions.
- Adds 1/10 second delay between a pAI being hit/bonked and closing up
(Effectively meaningless gameplay-wise).
2014-12-09 19:00:46 -05:00
Fox-McCloud
4868d3795d Vox and Space 2014-12-09 03:47:46 -05:00
DZD
8e4f2f6399 More Minor pAI bugfixes
- Closing a pAI turns off resting.
- Wiping a mobile pAI now works correctly. (Probably want to fix being
able to do this in the first place)
2014-12-08 18:22:18 -05:00
Fox-McCloud
cd6814e380 Merge pull request #48 from Markolie/master
Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes
2014-12-06 22:59:38 -05:00
Markolie
b8a440f23a Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes 2014-12-07 04:55:48 +01:00
DZD
b951d5a8f8 IT WOOOOOOOOORKS
- Fixed pAI master interface.
- Removed debug code and redundant and unused proc.
2014-12-06 16:19:47 -05:00
DZD
0c75432620 Merge remote-tracking branch 'upstream/master' 2014-12-06 13:09:13 -05:00
Fox-McCloud
ce94dbe5e9 Merge pull request #43 from Markolie/master
HUD fixes, Vox naming change, Beepsky ID fix, IPC fixes
2014-12-06 03:04:27 -05:00
Fox-McCloud
21a1c0bc83 Stunning Changes 2014-12-06 02:33:31 -05:00
Markolie
86f80d5a69 IPC fixes galore 2014-12-06 08:28:02 +01:00
DZD
908058c8f0 Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port 2014-12-05 20:32:40 -05:00
Fox-McCloud
fd9d3edffb Cell Changes and other Stuff 2014-12-05 05:37:55 -05:00
Markolie
a1a80c1a27 Minor fixes 2014-12-04 18:18:01 +01:00
Fox-McCloud
673ba85ca8 Merge pull request #35 from SamCroswell/master
Dance Bar Update
2014-12-03 19:49:28 -05:00
SamCroswell
7a3f19d00f Area Tag Fix, Bar Is No Longer Space
The bar is no longer exposed to space via a tile under the booze-o-mat,
fix the area to be unpowered by default.
2014-12-03 19:41:33 -05:00
Fox-McCloud
72ecf4ba5e Merge pull request #34 from Fox-McCloud/Production-Tweaks
Production tweaks
2014-12-03 18:52:09 -05:00
Fox-McCloud
c218c1af3b Production and Mecha Tweaks 2014-12-03 18:20:51 -05:00
Markolie
cb7676c139 Re-add stamp images, add more holopads 2014-12-03 02:53:26 +01:00
DZD
dd631d4806 Migrating Bay pAI Drone Form Port 2014-12-02 18:00:24 -05:00
Markolie
b21575f088 Bot port from /tg/ 2014-12-02 17:59:40 +01:00
Fox-McCloud
79125ffb37 Merge pull request #28 from Fox-McCloud/Sprite-Updates
Sprite Updates
2014-12-02 09:04:09 -05:00
Fox-McCloud
67f8c7a79a Sprite Updates 2014-12-02 08:49:44 -05:00
Fox-McCloud
2957d22caf Merge pull request #25 from SamCroswell/master
Minor Security Update
2014-12-01 21:36:46 -05:00
SamCroswell
55e55e7c91 Minor Security Update
- Fixes seclite inhand, updates to the newer seclite icon.
- Corporate security outfits now spawn with the rest of the security
wardrobe.
2014-12-01 21:15:27 -05:00
Fox-McCloud
0adf73421f Merge pull request #21 from nicky89107/master
Fixes the telebaton logging to be the correct way around. Slightly modifies muzzle sprite to not look like it is eating faces.
2014-12-01 06:27:25 -05:00
Tigercat2000
770c2ca8e6 Fixes the telebaton logging to be the correct way around. 2014-11-30 20:20:14 -08:00
Fox-McCloud
6ba65ed1c7 Merge pull request #10 from nicky89107/master
Fixes handcuff log. All other commits have been reverted.
2014-11-30 21:18:55 -05:00
Tigercat2000
d70ca5acb2 Fix's the handcuffing logs to be Officer > Cuff-ee instead of Cuff-ee >
Officer
2014-11-30 12:54:09 -08:00