Commit Graph

3535 Commits

Author SHA1 Message Date
Fox-McCloud
37b1113ce6 Merge pull request #483 from SamCroswell/master
ESword Changes
2014-11-08 21:38:00 -05: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
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
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
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
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
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
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
Fox-McCloud
393ba993e2 Syndicate Bomb Port 2014-10-29 04:21:31 -04:00
Fox-McCloud
f77eb5c914 Traitor Gear and Balance 2014-10-28 01:35:03 -04: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
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
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
4419dc7243 Handcuff grab-requirement reversion
As requested by Fox
2014-10-18 18:05:10 +01:00
Bone White
1439dd5579 Hardsuit equip time reversion
At Fox's request
2014-10-18 01:46:28 +01:00
DZD
4ba9431ac6 Merge Pull Requests #430 and #431 from ZomgPonies/master 2014-10-15 18:38:33 -04:00
Fox-McCloud
8c1f6431e6 Tweaks and Fixes and Major Map Changed
More Info will be posted directly, later.
2014-10-13 22:00:07 -04:00
DZD
53de43ba9e Tables Climbing Through Solid Objects Fix
-Tables don't consider themselves solid object when trying to climb over
them.
2014-10-10 15:01:53 -04:00
DZD
2668bb6f9b Shutter and Table Tweaks
-Can no longer climb onto tables that are inside solid objects.
-Added shutters to HoP Office
-Fixed Psych Office shutters button so that it is linked to the Psych
Office shutters and not the ones in surgery.
2014-10-05 22:19:09 -04:00
Fox-McCloud
9c8326e120 Fix, Tweak, and Revise
fixes a few non-functioning things, adds in a few new features,
basically the previous patch minus "controversial" stuff.
2014-09-29 02:10:28 -04:00
PJB3005
58a76e7534 RCSses can send crates
simple copy paste of the code for closets
2014-09-24 17:23:26 +02:00
melandor0
7ff72c38cd nanotrasen.se
Replaces 80.244.78.90 with nanotrasen.se in the code.
2014-09-04 19:45:43 +02:00
melandor0
59f73acfd3 Traitorstation Fixes + SyndieCat
Fixes some things with traitorstation and adds SyndieCat.
2014-09-02 13:53:11 +02:00
VampyrBytes
c0f5132664 Cleanup of internal organs
Both internal and external organs are a mess, which is making
maintaining and updating them nasty, so I'm cleaning them up, this is
the first stage

mechanical and assisted internal organs are now an object type rather
than a var in the organ which makes it much cleaner and easier to adjust

removed duplicate list of internal organs as there's no reason to have
the same objects in 2 separate lists

made New() a lot cleaner and more robust

External organs will be next
2014-08-21 10:24:13 +01:00
ZomgPonies
6ebb6d617e Merge pull request #399 from Bone-White/master
Rigid suit equip delay rework
2014-08-20 03:07:09 -04:00
ZomgPonies
f4b6450a20 Merge pull request #398 from VampyrBytes/master
IPC and nuke disk fixes
2014-08-20 03:07:01 -04:00
Bone White
b5fcd209b2 Rigid suit equip delay rework
now uses a couple of new procs, allowing for per-suit tweaking of time.
You now cannot equip eva helms without first attaching them to the suit
(target head use helmet on suit)
2014-08-20 07:28:44 +01:00
VampyrBytes
5b8253fb57 IPC and nuke disk fixes
Fix for IPC revival
Prevents nuke disk from being inserted via cavity surgery
2014-08-19 07:06:12 +01:00
ZomgPonies
7139b92b47 Merge pull request #393 from Bone-White/master
Diona speed fix
2014-08-18 19:19:05 -04:00
Bone White
d2129341b9 Adds equip/unequip times to rigid suits
Also stops helmets being worn without the rigid suit already on the mob.
2014-08-18 08:16:06 +01:00
ZomgPonies
ed484b68aa Compile fix 2014-08-16 21:45:36 -04:00