Commit Graph

14099 Commits

Author SHA1 Message Date
SamCroswell
46793a2c04 Poker table fix, two handed fix, Nukeops naming
- Poker tables now actually use the poker table icon. I don't reccomend
you use this, as the poker table icon doesn't mesh well as of right now.
Plan to fix that at a later date.

- Items that require two hands now properly update when
wielded/unweilded. Hooray.

- Minor changes to the way nukeops naming works.
2014-11-09 21:37:14 -05:00
Markolie
2e0953a767 And re-adding my changes. 2014-11-09 05:39:01 +01:00
Mark van Alphen
cbe6479b17 Merge pull request #1 from ZomgPonies/master
Upstream merge
2014-11-09 04:34:19 +01:00
Fox-McCloud
37b1113ce6 Merge pull request #483 from SamCroswell/master
ESword Changes
2014-11-08 21:38:00 -05: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
Fox-McCloud
6dfc1f4d70 Merge pull request #482 from SamCroswell/master
Nukeops Update
2014-11-08 11:05:51 -05:00
Fox-McCloud
bf867da403 Merge pull request #469 from Nienhaus/master
Adds EngiCart
2014-11-08 10:58:25 -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
Markolie
1494e9749e Camera consistency fixes round two. 2014-11-08 16:16:30 +01:00
Fox-McCloud
bf93e9caaf Jetpacks for Sydnies! 2014-11-08 01:15:46 -05:00
Nienhaus
25a92c91fd Ports the TG style Jani Cart. 2014-11-07 22:48:44 -06: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
Nienhaus
6cfd8b7076 Adds EngiCart
http://i.imgur.com/18w9fkq.png Can hold three toolboxes, metal, plasteel, glass, tape, and a flashlight.
2014-11-07 19:18:48 -06:00
DZD
489bff2983 Rolling Paper Icon Fix
Fixes icon_state of individual sheets of rolling paper so they actually
show a sprite.
2014-11-07 16:09:50 -05:00
Fox-McCloud
a8bda9d958 Merge pull request #438 from Bram961/master
Pirate outfit
2014-11-07 10:40:46 -05:00
SamCroswell
40ba16c708 Merge branch 'master' of https://www.github.com/ZomgPonies/Paradise
Conflicts:
	maps/cyberiad.dmm
2014-11-06 16:38:55 -05:00
Fox-McCloud
4fa54c7dc0 Nuke Ops Map 2014-11-06 11:21:59 -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
Markolie
f150cabd19 Lockers can now be closed if they are in front of a fireaxe cabinet (or any other closet object which is anchored and as such can not be stored). 2014-11-05 18:29:05 +01:00
Markolie
3c6c11c22d Also prevents lockers from being (un)welded from inside. 2014-11-05 18:09:47 +01:00
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
SamCroswell
ed2be54841 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-11-04 21:00:57 -05:00
Fox-McCloud
650c9a3e3c Nuke Ops Rework Phase 1 2014-11-03 23:45:00 -05:00
Markolie
69aad225d0 Fix space. 2014-11-04 03:14:35 +01:00
Markolie
a0abc79368 Personal lockers can no longer be locked from the inside. Also fixes the "It won't budge" message which kept appearing. Per https://github.com/ZomgPonies/Paradise/issues/452. 2014-11-04 03:13:03 +01: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
Markolie
4653d922af Just as a safety precaution in case the client can unset the disabled option on the buttons. 2014-11-02 19:37:06 +01:00
Markolie
904be8db74 Updated Telescience Console to use the updated Nano UI, rather than the regular pop-up UI. I was going to stick with just ensuring the console itself updates when you edit one of the coordinates (as previously you'd have to re-open the pop-up), but I figured I might as well update it to the newer Nano code. 2014-11-02 04:24:25 +01:00
DZD
e886c3d982 Merge remote-tracking branch 'upstream/master' 2014-11-01 16:14:34 -04:00
Fox-McCloud
c879ead4f7 Music Updates 2014-10-31 21:55:25 -04:00
Fox-McCloud
42dce57841 Oops
Forgot the Chaplain...
2014-10-31 07:50:04 -04:00
Fox-McCloud
8e6b93a7cc Vamp Mode Specifications 2014-10-31 07:39:03 -04:00
Fox-McCloud
cb33af8b48 SyndiBomb Fix 2014-10-31 00:19:10 -04:00
DZD
6863cdfb2d Fixes Table Climbing Edge Case with Windoors
With the fix that I had implemented to prevent climbing through solid
objects, a windoor on the other side of a table would prevent climbing,
now the check ignores windoors, as they already block climbing from the
same side.
2014-10-30 20:20:45 -04:00
DZD
474fab7cc8 Keeping up to date with ZomgPonies/Paradise 2014-10-30 19:37:56 -04:00
Bone White
226ef19345 Removes duplicate entries in floor stat panel
As title.
2014-10-30 10:54:58 +00:00
Fox-McCloud
393ba993e2 Syndicate Bomb Port 2014-10-29 04:21:31 -04:00
Fox-McCloud
939a82016c Merge pull request #451 from Bone-White/master
Support Jobs on ID Comp Fix
2014-10-28 17:36:25 -04:00
Bone White
46adb0dd0c Support Jobs on ID Comp Fix
Finally puts support jobs back on the ID (HoP) computer.

Removed NT rep from the list of positions that can be chosen (as it's a
central assigned position only).

Slightly altered the colours of the interface to make it easier to read.
2014-10-28 11:39:12 +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
28b752b502 Merge pull request #447 from Bone-White/master
Civilian round-start fix (2)
2014-10-27 22:56:55 -04:00
Bone-White
447f383a8a Revert "Revert "Civilian round-start fix"" 2014-10-28 02:53:03 +00:00