dd200af4bf
Nuke Ops Rework Phase 2
2014-11-05 06:56:46 -05:00
ed2be54841
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
2014-11-04 21:00:57 -05:00
650c9a3e3c
Nuke Ops Rework Phase 1
2014-11-03 23:45:00 -05:00
69aad225d0
Fix space.
2014-11-04 03:14:35 +01:00
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
41e04b508a
Merge pull request #454 from Bone-White/master
...
Floor Plaque Updated
2014-11-02 21:26:02 -05:00
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
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
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
e886c3d982
Merge remote-tracking branch 'upstream/master'
2014-11-01 16:14:34 -04:00
c879ead4f7
Music Updates
2014-10-31 21:55:25 -04:00
42dce57841
Oops
...
Forgot the Chaplain...
2014-10-31 07:50:04 -04:00
8e6b93a7cc
Vamp Mode Specifications
2014-10-31 07:39:03 -04:00
cb33af8b48
SyndiBomb Fix
2014-10-31 00:19:10 -04:00
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
474fab7cc8
Keeping up to date with ZomgPonies/Paradise
2014-10-30 19:37:56 -04:00
226ef19345
Removes duplicate entries in floor stat panel
...
As title.
2014-10-30 10:54:58 +00:00
393ba993e2
Syndicate Bomb Port
2014-10-29 04:21:31 -04:00
939a82016c
Merge pull request #451 from Bone-White/master
...
Support Jobs on ID Comp Fix
2014-10-28 17:36:25 -04:00
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
b0d73b0143
Merge pull request #450 from Bone-White/master
...
Disappearing Chemdispenser fix
2014-10-28 02:17:01 -04:00
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
f77eb5c914
Traitor Gear and Balance
2014-10-28 01:35:03 -04:00
28b752b502
Merge pull request #447 from Bone-White/master
...
Civilian round-start fix (2)
2014-10-27 22:56:55 -04:00
447f383a8a
Revert "Revert "Civilian round-start fix""
2014-10-28 02:53:03 +00:00
6cd660874c
Civilian round-start fix (2)
...
Hopefully it works this time, tested locally as extensively as I can.
I have left a _very_ verbose debug line (103) in job_controller.dm which
should be commented out very soon.
Please keep var/Debug2 in global.dm set to 1 for the forseeable future,
to help diagnose job problems.
2014-10-28 02:51:27 +00:00
eb21c8e4b0
Revert "Civilian round-start fix"
2014-10-27 21:36:18 -04:00
ab88e06519
Merge pull request #445 from Bone-White/master
...
Civilian round-start fix
2014-10-27 11:57:22 -04:00
6853a69b1f
Bulletproofing
...
Better bulletproofing of the civilian round-start fix
2014-10-27 15:53:35 +00:00
9b9c20b115
Civilian round-start fix
2014-10-27 15:47:05 +00:00
15ed98a776
Merge pull request #444 from Bone-White/master
...
Radiation Laser Update
2014-10-27 01:01:12 -04:00
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
e0059bbf46
Implant Fix
2014-10-25 22:47:09 -04:00
3328b9f30c
Merge pull request #440 from Fox-McCloud/R&D-Nerfs
...
R&d nerfs
2014-10-25 21:18:13 -04:00
678027dfe1
Merge pull request #441 from Bone-White/master
...
Added Radiation Laser
2014-10-25 21:12:00 -04:00
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
097cc95bd2
R&D Nerfs
2014-10-25 20:54:25 -04:00
0028617926
Merge pull request #439 from melandor0/paradise
...
Sec/Med Hud fixes
2014-10-24 21:55:31 -04:00
7f613ecb0c
Merge pull request #437 from Bone-White/master
...
French Crossbow Ammo Restriction
2014-10-24 21:54:37 -04:00
4a081070b3
Sec HUD fixes
...
Now reports beepsky and ED 209 arrest activity.
2014-10-24 21:16:00 +02:00
1e8681cc11
Pirate outfit
...
A new outfit looking like the one a pirate captain would wear
2014-10-24 17:16:42 +02:00
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
b1b23dcd70
ParaPen Fix
...
Fixes Parapens and removes extra code
2014-10-23 20:11:29 -04:00
da35e2b677
new advanced med hud sprite
2014-10-23 02:23:27 +02:00
b6c46fdc63
Merge pull request #435 from melandor0/paradise
...
Drugs, Vampires, Plasma windows
2014-10-21 23:22:20 -04:00
d46266fcd8
More drugs
2014-10-22 04:49:42 +02:00
a836e10013
Confirmation screen for become mask
...
As requested by Mark
2014-10-21 22:29:23 +01:00
546b6caf59
Preliminary new drugs
2014-10-20 02:52:54 +02:00
4419dc7243
Handcuff grab-requirement reversion
...
As requested by Fox
2014-10-18 18:05:10 +01:00
ebe1026bda
Improved Sleeper error message clarity
2014-10-18 12:16:27 +01:00
Fox-McCloud