Markolie
ae8f08e2b8
Fixes reflection, various security level fixes, gamma armory update, communication console fixes
2014-11-29 02:05:42 +01: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
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
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
1269fe7d4e
Fix encryption key name
2014-11-21 23:58:13 +01:00
Markolie
b64a09ec6c
Fix grilles
2014-11-21 19:15:42 +01:00
Markolie
6595b8c38e
Fix cloning/telebaton
2014-11-21 04:31:38 +01:00
SamCroswell
7c2f2d09d2
Adds Duffelbag, Fixes Inhand for Hammers
2014-11-20 20:04:41 -05:00
Markolie
06b0a7a89f
Re-add Dave's changes, nerf remote view/remote talk
2014-11-21 00:17:52 +01: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
Markolie
59edf2701d
Makes SMES'es and Vending Machines constructable and upgradeable, gives borgs recorders
2014-11-18 20:36:40 +01:00
Markolie
3e67587869
Allows the freezer/heater to actually be connected, minor machine fixes, janitor mop fix, drone can now clean bottles
2014-11-18 17:31:43 +01:00
Markolie
2f7d3ae26d
Additional constructable and upgradeable machines, adds soap to drones, updates teleporter
2014-11-18 03:13:12 +01:00
Markolie
876a5067a0
Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes
2014-11-17 08:32:39 +01:00
DZD
0fd91f8a90
Merge remote-tracking branch 'upstream/master'
2014-11-16 18:03:55 -05:00
Markolie
b2d0e26a6d
Add meson goggles to atmos lockers, add alert camera monitors to engineering
2014-11-14 15:55:38 +01:00
Markolie
0cd3223536
AI fixes, borg fixes, map fixes
2014-11-14 14:15:17 +01:00
DZD
125d40d904
Merge remote-tracking branch 'upstream/master'
2014-11-12 19:22:13 -05:00
Fox-McCloud
f84ca26012
Fixes and Stuff
2014-11-11 22:48:08 -05:00
DZD
a28a83b0e9
Merge remote-tracking branch 'upstream/master'
2014-11-11 09:14:56 -05:00
Fox-McCloud
be3e2740c5
PDA Fix
2014-11-10 20:53:38 -05:00
DZD
1e67cf2548
Table Climbing Block Formatting Fixes
...
Just a little bit of formatting improvements to the table climbing block
in case of solid object, fixes issue with having "You cannot climb a the
reinforced table," and specifies what object is in the way of climbing.
2014-11-10 19:34:35 -05:00
Fox-McCloud
a1a71006c0
Oops
2014-11-10 03:21:31 -05:00
