Commit Graph

8147 Commits

Author SHA1 Message Date
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
06b0a7a89f Re-add Dave's changes, nerf remote view/remote talk 2014-11-21 00:17:52 +01:00
Markolie
d8f568494d Let AI state laws over specified channel, lets borgs state laws 2014-11-20 22:27:47 +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
59edf2701d Makes SMES'es and Vending Machines constructable and upgradeable, gives borgs recorders 2014-11-18 20:36:40 +01:00
Markolie
4115c98d9d Glass instead of wood for bottles 2014-11-18 17:34:01 +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
Mark van Alphen
f1278b799d Merge pull request #1 from ZomgPonies/master
Upstream merge
2014-11-17 08:48:31 +01:00
Markolie
876a5067a0 Adds constructable and upgradeable machinery, fixes the RPED, other minor fixes 2014-11-17 08:32:39 +01:00
Markolie
b0963fa860 Slime runtime error fixes, minor map fixes 2014-11-15 05:02:10 +01:00
Markolie
cbe2bee4c2 Crazy amount of map fixes. 2014-11-15 01:39:00 +01:00
Markolie
fa8ecd6527 Fix APC runtime error, open nuke interface when inserting disk 2014-11-14 18:37:21 +01:00
Markolie
0cd3223536 AI fixes, borg fixes, map fixes 2014-11-14 14:15:17 +01:00
Fox-McCloud
f84ca26012 Fixes and Stuff 2014-11-11 22:48:08 -05:00
Fox-McCloud
111b24ceb8 Janitor Rework 2014-11-10 03:17:56 -05:00
Mark van Alphen
cbe6479b17 Merge pull request #1 from ZomgPonies/master
Upstream merge
2014-11-09 04:34:19 +01:00
Markolie
1d4b9c36b2 Switch Keycard Authentication Device to NanoUI 2014-11-09 01:37:51 +01:00
SamCroswell
211023bd67 Syndicate Medibots, Energy Recharge Fix
- Adds the ability to construct Syndicate Medbots, which were previously
in the code but unable to be constructed. These bots will only heal
Syndicate Nukeops, and can only be made from the medikit box that
Nukeops can purchase.

- Fixed recharging in energy crossbows and laser tag guns, they were
recharging 10x slower than they were meant to.
2014-11-08 19:16:33 -05:00
Markolie
7405ae30ee Camera console network rework 2014-11-08 23:12:38 +01:00
SamCroswell
4ffd1a94e6 M1911P Fix
Forgot to reset the M1911P's weight and slot flags, since it's a child
of the pulse rifle. My bad.
2014-11-08 14:21:04 -05:00
SamCroswell
28c15dcc26 ESword Changes
- All weapons now have a 'no_embed' var. If this var is set to 1 (It is
0 by default) the item will bypass checks to embed into people during
melee combat and when thrown. This is intended to be used for items such
as the esword, where it is physically impossible for it to be embedded
into someone, as opposed to something like the telebaton, where it's
simply improbably that would get embedded into anyone.

- All energy-based melee weapons have no_embed set to 1.

- All energy-based melee weapons now have a more appropriate hitsound
when active. See: blade1.ogg
2014-11-08 14:12:11 -05:00
SamCroswell
722fd6a1e0 Nukeops Update
- Gave the nukeops leader the ability to choose the name of their team.

- Gave the Bulldog an in-hand icon identical to the c20r until we can
figure out how to add left hand right hand icons without breaking
everything.

- Added a helmet for the Syndicates, identical to the helmet they
already had with a special icon.

- Replaced the SWAT helmet they had in their lockers with the new Syndi
helmets.
2014-11-08 10:51:20 -05:00
SamCroswell
a8a585ba32 Map Update, Pulse Rifle Change
Map changes:
- Genetics APC fixed.
- Gygax removed from the armory at Fox's request.
- AI chamber reverted at Fox's request.
- Updated admin room.

Pulse rifles may now only be carried on a person's back. Because we
don't allow fun here.

Fancy new L6 SAW icon as well.
2014-11-07 23:05:34 -05:00
Fox-McCloud
a8bda9d958 Merge pull request #438 from Bram961/master
Pirate outfit
2014-11-07 10:40:46 -05:00
Fox-McCloud
e1c83d7f55 Nuke-Ops-Final 2014-11-06 07:29:16 -05:00
Fox-McCloud
9b6dc5cdb5 Merge pull request #458 from Markolie/master
Magistrate/Psych Office shutter fixes, telescience console UI update, camera fixes, borg movement fix, security windoor fix, CentComm identification computer fix, locker fixes
2014-11-06 03:18:14 -05:00
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
Fox-McCloud
650c9a3e3c Nuke Ops Rework Phase 1 2014-11-03 23:45:00 -05:00
Fox-McCloud
41e04b508a Merge pull request #454 from Bone-White/master
Floor Plaque Updated
2014-11-02 21:26:02 -05:00
Markolie
c67ea2c1e4 Fixes an issue where borgs who have their power cell removed or damaged are still able to see and move. The expected behaviour should be that they turn blind and are unable to move, which is what happens when a borg runs out of charge completely.
Per http://nanotrasen.se/phpBB3/viewtopic.php?f=13&t=2748
2014-11-02 22:58:19 +01:00
Bone White
226ef19345 Removes duplicate entries in floor stat panel
As title.
2014-10-30 10:54:58 +00:00
Fox-McCloud
b0d73b0143 Merge pull request #450 from Bone-White/master
Disappearing Chemdispenser fix
2014-10-28 02:17:01 -04:00
Bone White
dd8815049e Disappearing Chemdispenser fix
Found this age-old problem.  Doesn't update the sprite after the
explosion, but DOES stop it going invisible and non-clickable.
2014-10-28 06:10:02 +00:00
Fox-McCloud
f77eb5c914 Traitor Gear and Balance 2014-10-28 01:35:03 -04:00
Fox-McCloud
15ed98a776 Merge pull request #444 from Bone-White/master
Radiation Laser Update
2014-10-27 01:01:12 -04:00
Bone White
5f56a28a8a Radiation Laser Update
Hid message when missing.

Added all medical jobs + brig phys to the requirement of jobs to
purchase this traitor item.

As requested by Fox.
2014-10-27 02:24:06 +00:00
Fox-McCloud
e0059bbf46 Implant Fix 2014-10-25 22:47:09 -04:00
Fox-McCloud
3328b9f30c Merge pull request #440 from Fox-McCloud/R&D-Nerfs
R&d nerfs
2014-10-25 21:18:13 -04:00
Fox-McCloud
678027dfe1 Merge pull request #441 from Bone-White/master
Added Radiation Laser
2014-10-25 21:12:00 -04:00
Bone White
42867b255d Added Radiation Laser
Traitor item, cmo/doctor/virologist only.  3 TC cost, looks like a
health analyzer but is a delayed radiation + stun effect on attack.  Has
recharge time and configurable settings.

Fox did most of the work, I just fixed it.
2014-10-26 01:08:18 +00:00
Fox-McCloud
097cc95bd2 R&D Nerfs 2014-10-25 20:54:25 -04:00
Fox-McCloud
0028617926 Merge pull request #439 from melandor0/paradise
Sec/Med Hud fixes
2014-10-24 21:55:31 -04:00
Fox-McCloud
7f613ecb0c Merge pull request #437 from Bone-White/master
French Crossbow Ammo Restriction
2014-10-24 21:54:37 -04:00
melandor0
4a081070b3 Sec HUD fixes
Now reports beepsky and ED 209 arrest activity.
2014-10-24 21:16:00 +02:00
Bram961
1e8681cc11 Pirate outfit
A new outfit looking like the one a pirate captain would wear
2014-10-24 17:16:42 +02:00
Bone White
fff6f2a264 French Crossbow Ammo Restriction
Prevents arrows and rods being used in a french-powered crossbow.  Also
added preventative measure for cell installation.

Requested by Fox.
2014-10-24 14:11:55 +01:00