Migrating Bay pAI Drone Form Port
Merge pull request #10 from ParadiseSS13/master

Merge from Master
Merge pull request #11 from ParadiseSS13/master

Merge from Master
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.
Fixes Space Pod Health

Civilian space pod has 100 health instead of 200.
Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port
Stunning Changes
Merge pull request #45 from Fox-McCloud/Stun-Changes

Stunning changes
Merge pull request #43 from Markolie/master

HUD fixes, Vox naming change, Beepsky ID fix, IPC fixes
Merge pull request #44 from TheDZD/spacepod

Space Pod Weapon Fix and Misc. Changes
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.
Revert "NeinHaus' warning stripe icons"

This reverts commit a6a1ac9dc48b360236d7dfd6f569e6f7f8b9662a.
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.
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Conflicts:
	maps/cyberiad.dmm
Merge remote-tracking branch 'upstream/master'
IT WOOOOOOOOORKS

- Fixed pAI master interface.
- Removed debug code and redundant and unused proc.
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.
Merge pull request #46 from SamCroswell/master

NeinHaus' warning stripe icons
Merge pull request #30 from TheDZD/pAI-Drone-Port

Bay pAI Drone Form Port [Ready to Merge]
Fixed Pennywise mask sprite

One pixel was off