Commit Graph

17074 Commits

Author SHA1 Message Date
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
Fox-McCloud
e7d57174c0 Merge pull request #63 from Markolie/master
Bug fixes, /tg/ telescience port
2014-12-12 03:41:03 -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
8e1d0855df Properly Removes Slime Person Ventcrawl
Commit #535 on https://github.com/ZomgPonies/Paradise had not properly
removed the addition of the ventcrawl verb to Slime People, this is
fixed.
2014-12-10 21:45:05 -05: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
Fox-McCloud
16a9cfbefe Merge pull request #59 from Markolie/master
Add missing security pod pilot
2014-12-10 00:34:42 -05:00
Markolie
8a2f702150 Add missing security pod pilot 2014-12-10 06:33:29 +01:00
Fox-McCloud
066d5bb991 Merge pull request #57 from Markolie/master
Bug fixes
2014-12-10 00:31:12 -05:00
Markolie
115cfa1566 Shorten NT Rep 2014-12-10 06:29:09 +01:00
Markolie
36f69225fa Make sure the new accesses are in the ID computer 2014-12-10 06:26:27 +01:00
Markolie
7fa0290dc2 Access fix 2014-12-10 06:14:15 +01:00
Markolie
b8282b7cae Blueshield/NT Rep/NT Rec updates 2014-12-10 06:09:06 +01: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
Fox-McCloud
c1921ad150 PAI Changes 2014-12-09 22:45:05 -05:00
Fox-McCloud
1aff490e42 Magboots Fix 2014-12-09 22:11:18 -05: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
8b59fc7cf1 Merge pull request #51 from Markolie/master
Advanced Health HUD fix
2014-12-07 23:44:51 -05:00
Markolie
766831f1ff Advanced Health HUD fix 2014-12-08 02:26:13 +01:00
DZD
0c1c96a8b5 Minor Fixes to pAI Death and Adds Corgi Form
- Corgi form available to pAIs.
- Canine speech flavor text available to pAIs.
- Minor fixes to pAI death behavior, only creates robot debris if the
pAi is in drone form when it dies.
- pAI suicide now works while resting.
2014-12-07 17:27:48 -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
Fox-McCloud
d0140aefe3 Merge pull request #30 from TheDZD/pAI-Drone-Port
Bay pAI Drone Form Port [Ready to Merge]
2014-12-06 17:48:59 -05:00
DZD
83f22e3bf9 Fixes Ninja pAI Eject
Apparently I left messed this up when porting stuff over, wouldn't allow
ninja to eject the pAI from his suit.
2014-12-06 16:31:34 -05: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
SamCroswell
5738c94650 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2014-12-06 11:54:12 -05:00
SamCroswell
d23578525d NeinHaus' warning stripe icons
Adds NeinHaus' warning stripe icons as a child of the warning stripe
object, when mapping, if at all possible, please use these instead of
the turfs that come with them already on it, as these will merge with
the turf at runtime, and are more flexible.
2014-12-06 11:49:58 -05:00
SamCroswell
07435d52d1 Revert "NeinHaus' warning stripe icons"
This reverts commit a6a1ac9dc4.
2014-12-06 11:49:45 -05:00
SamCroswell
a6a1ac9dc4 NeinHaus' warning stripe icons
Adds NeinHaus' warning stripe icons as a child of the warning stripe
object, when mapping, if at all possible, please use these instead of
the turfs that come with them already on it, as these will merge with
the turf at runtime, and are more flexible.
2014-12-06 11:48:20 -05:00
Fox-McCloud
fec371226d Merge pull request #44 from TheDZD/spacepod
Space Pod Weapon Fix and Misc. Changes
2014-12-06 03:05:04 -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
DZD
e96f7799bb Fixes Space Pod Health
Civilian space pod has 100 health instead of 200.
2014-12-05 20:22:25 -05:00
DZD
90bbdcac2c Space Pod Weapons Fix and Minor Changes
- [x]Space pods will now fire their weapons properly.
- [x]Space pods now have less health (150 for regular pods, 200 for
security)
- [x]Space pods now have a light that can be toggled on/off.
- [x]Security pod now has a regular taser rather than a burst taser by
default
- [x]Adjusted fire rates and energy costs for space pod weapons
- [x]Tasers can fire every 2 seconds at a 250 energy cost.
- [x]Lasers can fire every 3 seconds at a 300 energy cost.
- [x]Burst tasers can fire every 4 seconds at a 350 energy cost.
2014-12-05 20:21:11 -05:00
Markolie
6c92a48c41 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2014-12-06 01:31:31 +01:00
Markolie
aa68b2e160 AI/Cyborg HUD fixes, lets Vox's pick name when spawning, fixes Beepsky's/ED-209's ID'ing issue 2014-12-06 01:26:59 +01:00
Fox-McCloud
278581e14a Merge pull request #42 from SamCroswell/master
Map + Bug Fixes
2014-12-05 19:10:23 -05:00
SamCroswell
2d1f82f94e VERY Minor Map Fixes, Bug Fixes
The plating in the maintenance bar now has the correct icon when given
tiles.

Borgs can no longer add their modules to carts.

The hand teleporter now recharges properly again.
2014-12-05 19:08:36 -05:00
Fox-McCloud
fd9d3edffb Cell Changes and other Stuff 2014-12-05 05:37:55 -05:00
Fox-McCloud
1a1cc7137d Merge pull request #40 from SamCroswell/master
Coin Flipping! Also more map fixes.
2014-12-04 17:16:03 -05:00
SamCroswell
a1959291b7 Coin Flipping! Also more map fixes. 2014-12-04 17:12:41 -05:00
Fox-McCloud
31c6fc986e Merge pull request #38 from Markolie/master
Adds a "Toggle Sensors" verb to the robot/AI to set their HUD
2014-12-04 16:45:52 -05:00
Fox-McCloud
3cd97430df Merge pull request #39 from SamCroswell/master
Minor Map Fixes - New Costume Preset
2014-12-04 16:26:45 -05:00