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
269253d5d2
SyndiBorg flash removed, CentCom access update
2014-11-23 08:23:52 +01:00
Markolie
74e72cdad6
Add hud icons for various jobs
2014-11-23 07:58:49 +01: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
Fox-McCloud
99c7c4b667
Merge pull request #493 from nicky89107/master
...
Gibbing sound effects and screams + clarifying admin OOC color verb's name.+ Machine people *buzz *ping and *beep emotes -Tigercat2000
2014-11-22 21:38:03 -05:00
SamCroswell
c4e97f6b72
Synicate Medibot Access Fix
...
Syndicate Medibots now require Synidcate-level access to open.
2014-11-22 17:38:37 -05: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
Fox-McCloud
2727a1143f
Merge pull request #512 from Markolie/master
...
Re-add harmbatonning, add forcesay, psych office locker
2014-11-22 15:37:38 -05:00
Markolie
dd70ba2030
Adds a psychiatrist's locker to the psychiatrist's locker, with a straight jacket, syringe and a pill bottle with 2x Citalopram and 2x Methylphenidate
2014-11-22 20:58:26 +01:00
Markolie
e9fc80fe7f
Re-add harmbatonning. Adds forcesay: if you're typing when you get hit by a stun weapon, you say a garbled version of what you were typing (from /tg/).
2014-11-22 20:22:28 +01:00
Fox-McCloud
f43ae4a8f8
Merge pull request #511 from SamCroswell/master
...
Adds Duffelbags, Hammer Inhand Fix, Weapon Description Update
2014-11-22 13:40:10 -05:00
SamCroswell
90bb1c5861
Weapon description update
...
Updated a few weapon descriptions to fit properly.
2014-11-22 13:33:25 -05:00
Fox-McCloud
ffdd025076
Merge pull request #510 from Markolie/master
...
Syndicate teleporter fix, fix fire alarm in engineering that gets EMP'ed
2014-11-22 11:24:34 -05:00
Markolie
fd064b8e35
Teleporter can no longer lock on to syndicate beacons. Teleporter/beacons can be emagged to enable syndicate option.
2014-11-22 07:54:13 +01:00
Fox-McCloud
222e26e23f
Merge pull request #508 from Markolie/master
...
Fixes grilles, constructable machine upgrade, proper hardsuit conversion, R&D updates, constructable display case
2014-11-22 00:57:02 -05:00
Markolie
c0f1c92bef
Windoor damage fix, allows deconstruction of windoors
2014-11-22 06:48:51 +01:00
Markolie
107325bb43
Melee attack for mechs
2014-11-22 06:05:13 +01:00
Markolie
9bd63e8c84
Upping the research levels for the Phazon
2014-11-22 05:35:09 +01:00
Markolie
2c2c7fc517
Constructable Phazon, constructable display case
2014-11-22 05:15:44 +01:00
DZD
0f0829ea78
Merge remote-tracking branch 'upstream/master'
2014-11-21 22:47:05 -05:00
Markolie
42dd08ff7d
Variable typo fix, add proper Unati/Tajaran hardsuit conversion from Baystation
2014-11-22 02:24:21 +01:00
Markolie
229824afc4
Fix duplicate numbers in autolathe
2014-11-22 00:59:24 +01:00
Markolie
24fcbb5de4
Autolathe fix
2014-11-22 00:53:09 +01:00
Markolie
e0234565bc
Remove the duplicate decloner
2014-11-22 00:37:55 +01:00
Markolie
1269fe7d4e
Fix encryption key name
2014-11-21 23:58:13 +01:00
Markolie
7415d1be99
Add the decloner to R&D
2014-11-21 21:50:01 +01:00
Markolie
3d806081d0
Let protolathe's be loaded with chemicals again, let circuitprinter drop chemicals when deconstructed
2014-11-21 21:39:43 +01:00
Markolie
5b3df5a690
Fix names of scanning modules
2014-11-21 19:40:31 +01:00
Markolie
b64a09ec6c
Fix grilles
2014-11-21 19:15:42 +01:00
Tigercat2000
08016a957d
Adds Machine-People specific *buzz *ping and *beep emotes.
2014-11-20 21:36:10 -08:00
Tigercat2000
ef82aa2d70
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-11-20 20:59:46 -08:00
Tigercat2000
067d9565e3
Changes the button for admin OOC color to be descriptive of such. "OOC
...
Text Color" to "Personal OOC Text Color"
2014-11-20 20:13:31 -08:00
Markolie
6595b8c38e
Fix cloning/telebaton
2014-11-21 04:31:38 +01:00
Markolie
421c461705
Some more map fixes
2014-11-21 03:17:10 +01:00
Tigercat2000
5eb90608fa
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-11-20 17:51:02 -08:00
SamCroswell
7c2f2d09d2
Adds Duffelbag, Fixes Inhand for Hammers
2014-11-20 20:04:41 -05:00
Markolie
e9e3705e61
Minor map fixes, teleporter description fix
2014-11-21 01:18:41 +01:00
Markolie
06b0a7a89f
Re-add Dave's changes, nerf remote view/remote talk
2014-11-21 00:17:52 +01:00
Markolie
c2ce8a63b9
Merge conflict
2014-11-20 22:43:31 +01:00
Markolie
dc2efa6dbb
Fixing merge conflict
2014-11-20 22:41:34 +01:00
Markolie
03ef55ca4d
And recommitting my changes
2014-11-20 22:39:03 +01:00
Mark van Alphen
e3443532c0
Merge pull request #4 from ZomgPonies/master
...
Upstream merge
2014-11-20 22:37:35 +01:00
Markolie
63cb529297
See if this fixes the conflict
2014-11-20 22:37:13 +01:00
Markolie
d8f568494d
Let AI state laws over specified channel, lets borgs state laws
2014-11-20 22:27:47 +01:00
Fox-McCloud
16b525684c
Merge pull request #500 from SamCroswell/master
...
Updates
2014-11-20 16:09:51 -05:00
Markolie
3777f5c8bf
Revert debugging
2014-11-20 20:56:34 +01:00
Tigercat2000
c79cb69c56
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-11-20 00:21:41 -08:00
Markolie
dd3739119e
Properly document harmbatonning removal, window update check
2014-11-20 00:55:26 +01:00
Markolie
e2e996fbbf
Glass now changes color when built based on the area, map fixes
2014-11-20 00:08:29 +01:00
Markolie
8f47f50009
Fix stun batons and holographic sign projectors
2014-11-19 20:20:10 +01:00
Fox-McCloud