Migrating Bay pAI Drone Form Port
Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port
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
Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes
Merge pull request #48 from Markolie/master

Add clothing vendors to cargo, fix syndiborg/dsborg, laptop fix, other minor fixes
Merge pull request #47 from wubbledaddy/master

Fixed Pennywise mask sprite
Fix windoor access requirement on holding cell
Merge pull request #49 from Markolie/master

Fix windoor access requirement on holding cell
Advanced Health HUD fix
Merge pull request #51 from Markolie/master

Advanced Health HUD fix
Merge pull request #12 from ParadiseSS13/master

Merge From Master