Commit Graph

8128 Commits

Author SHA1 Message Date
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
Fox-McCloud
b1b23dcd70 ParaPen Fix
Fixes Parapens and removes extra code
2014-10-23 20:11:29 -04:00
melandor0
da35e2b677 new advanced med hud sprite 2014-10-23 02:23:27 +02:00
Fox-McCloud
b6c46fdc63 Merge pull request #435 from melandor0/paradise
Drugs, Vampires, Plasma windows
2014-10-21 23:22:20 -04:00
melandor0
d46266fcd8 More drugs 2014-10-22 04:49:42 +02:00
Bone White
a836e10013 Confirmation screen for become mask
As requested by Mark
2014-10-21 22:29:23 +01:00
melandor0
546b6caf59 Preliminary new drugs 2014-10-20 02:52:54 +02:00
Bone White
4419dc7243 Handcuff grab-requirement reversion
As requested by Fox
2014-10-18 18:05:10 +01:00
Bone White
5b679a5575 Hardsuit procedural slow reversion
As requested by Fox
2014-10-18 02:10:39 +01:00
Bone White
c8f0584063 Ryetalyn volume-based cure revision
As requested by Fox
2014-10-18 01:53:27 +01:00
Bone White
1439dd5579 Hardsuit equip time reversion
At Fox's request
2014-10-18 01:46:28 +01: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
Fox-McCloud
53b171f9c5 Revert "Hostile Environments Reblance" 2014-10-13 16:42:32 -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
ZomgPonies
7edcbe574d Merge pull request #423 from PJB3005/master
bananium smeltable and RCSses can send crates
2014-09-26 17:51:06 -04:00
ZomgPonies
8ca4401efc Merge pull request #421 from Allfd/master
Vox scream changes
2014-09-26 17:50:43 -04:00
PJB3005
e5e9013ab4 make bananium smeltable
exactly as the title says, though, the smelter menu calls it 'clown',
because the oretag is clown, didn't fix it, because i dont know what
things use the oretag variable(i know some), and didn't want to break
anything over such a small bug
2014-09-24 15:15:56 +02:00
Bone White
09a0eee875 Fix for hardsuit modifications
When suits are turned to tajaran or unathi types, any helmets on the
suit are put on the floor.
2014-09-14 20:25:50 +01:00
Bone White
d81a87363e Fix for Ryetalin
Cures on a chance based on volume of ryetalin injected, on_mob_life.
TURNS OFF ALL MUTATIONS!!

// 1 volume = ~2% chance
// 10 volume = ~17% chance
// 30 volume = ~38% chance

Returns SE to mob creation values (now set in dna2.dm)
2014-09-14 11:39:52 +01:00
Allfd
4b00f3d244 Vox scream changes
Modified the scream emote so that Vox and Vox Armalis will give a Vox
shriek instead of a human scream.
2014-09-13 03:12:02 -04:00