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
Markolie
0bf46a71b1
Map changes, bug fixes
2014-11-30 20:10:34 +01:00
Fox-McCloud
4b2e3beb96
Weapon Changes
2014-11-30 08:18:29 -05:00
Tigercat2000
34d4bb0da4
Whoops, Left in some unfinished code, removed
2014-11-29 17:18:00 -08:00
Tigercat2000
28bff4161e
Makes unable to scan message red instead of blue
2014-11-29 16:57:12 -08:00
Tigercat2000
7512adf2f5
Fixes a potentially abusable bug involving the chameleon projector and
...
playing cards.
2014-11-29 16:54:49 -08:00
Markolie
39eada12ba
Move service channel to :z
2014-11-29 22:07:50 +01:00
Markolie
bd11c78235
Replace every instance of NanoTrasen with Nanotrasen.
2014-11-29 21:01:29 +01:00
Markolie
0dc52900cc
Adds the service channel (:v)
2014-11-29 21:01:19 +01:00
Fox-McCloud
3b884622c5
Job Changes
2014-11-29 09:10:31 -05:00
Markolie
35fa4600e7
Merge branch 'master' of https://github.com/Markolie/Paradise
2014-11-29 02:39:45 +01:00
Markolie
ae8f08e2b8
Fixes reflection, various security level fixes, gamma armory update, communication console fixes
2014-11-29 02:05:42 +01:00
Fox-McCloud
0128878100
Merge pull request #535 from Fox-McCloud/Species-Guns
...
Species guns
2014-11-28 19:24:55 -05:00
Fox-McCloud
a4c72d4603
Species and Guns
2014-11-28 19:13:41 -05:00
Markolie
7e544c17bc
Fix DNA Injectors with abilities, adds mob's name to autopsy data
2014-11-28 21:14:00 +01:00
Markolie
f62cb59ad7
Default stunbaton back to 1500
2014-11-28 01:37:05 +01:00
Markolie
3b1dc8e487
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
...
Conflicts:
icons/obj/weapons.dmi
maps/cyberiad.dmm
2014-11-27 21:39:01 +01:00
Markolie
da0f915246
Fix cyborg zippo's
2014-11-27 21:19:18 +01:00
Markolie
b66f3effae
Bug fixes, implements new copying/faxing system from Bay
2014-11-27 21:00:58 +01:00
SamCroswell
5d6abde5ed
Deathsquad Cyborgs
...
Adds Deathsquad cyborgs. The only reason these really exist is because I
was bored, but hey! They come equipped with the latest in adminboos
gear, including a fully functional pulse rifle and esword, and a cell
that has 50,000 energy! What could go wrong?
2014-11-27 01:38:52 -05:00
SamCroswell
8b16d394ed
Projectile Laser Update
...
Lasers are now projectiles instead of instant beams. Fire delay removed,
damages adjusted accordingly.
2014-11-26 19:16:21 -05:00
Fox-McCloud
261157cb58
AI, PDA, and Other changes
2014-11-26 01:18:49 -05:00
Fox-McCloud
d95520894b
Merge pull request #525 from Markolie/master
...
Bug fixes, wording changes
2014-11-25 18:00:51 -05:00
Markolie
3be1a2553e
Bug fixes, wording changes
2014-11-25 22:56:12 +01:00
Fox-McCloud
86838eaf38
Merge pull request #518 from Markolie/master
...
Add confirmation to Syndiborg
2014-11-23 06:59:39 -05:00
Mark van Alphen
70f8046105
Update uplinks.dm
2014-11-23 09:56:08 +01:00
Fox-McCloud
2f25e4f162
Merge pull request #515 from Markolie/master
...
Adds Syndiborg to Nuke Ops, enables shortcuts for borgs/drones, notifies the AI of borg changes
2014-11-23 02:25:40 -05:00
Markolie
30c1960fe8
Adds Syndiborg to NukeOps, enables shortcuts for borgs/drones, notifies the AI of borg changes
2014-11-23 07:52:38 +01:00
SamCroswell
53cb7776b1
Map Changes, Duffelbag Fix
...
- Re-did admin room clothing storage
- Added the hammers to the weapon storage
- Replaced the unloaded mechs with loaded mechs
- Added Misc mecha equiptment next to the mechs in crates
- Replaced the Emergency NanoMed on the Syndi Ship with a SyndiMed. Same
thing, different access requirements, different icon.
- Replaced the vending machines with syndicate vending machines on the
Nukeops starting area. These require no access to use, and vend EVIL
items.
- Replaced the Syndicate DS mechs with loaded versions, as they were
unloaded.
- Removed the nonfunctional radio broadcaster on the Ruskie DJ Station.
- Fixed the captain duffelbag duplicate define.
2014-11-22 17:31:56 -05:00
