cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,289 Commits 14 Branches 2 Tags
dd200af4bf723a100717e021fa043b5998a65ec7
Commit Graph
18289 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fox-McCloud dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
Fox-McCloud 165639cd2c Merge pull request #28 from ZomgPonies/master 
Merge From Master
 2014-11-04 13:57:17 -05:00
Fox-McCloud bb296d5acd Merge pull request #460 from Fox-McCloud/Guns-Mech-Fixes 
Nuke Ops Rework: Round 1
 2014-11-04 00:26:33 -05:00
Fox-McCloud 650c9a3e3c Nuke Ops Rework Phase 1 2014-11-03 23:45:00 -05:00
Fox-McCloud 2756be2d6c Merge pull request #27 from ZomgPonies/master 
Merge from Master
 2014-11-03 03:00:47 -05:00
Fox-McCloud 41e04b508a Merge pull request #454 from Bone-White/master 
Floor Plaque Updated
 2014-11-02 21:26:02 -05:00
Fox-McCloud add514dd11 Merge pull request #428 from TheDZD/master 
Minor Shutter and Table Bugfixes
 2014-11-02 21:25:36 -05:00
DZD e886c3d982 Merge remote-tracking branch 'upstream/master' 2014-11-01 16:14:34 -04:00
Fox-McCloud 256984e43f Merge pull request #457 from Fox-McCloud/Music-Updates 
Music updates
 2014-10-31 22:13:29 -04:00
Fox-McCloud c879ead4f7 Music Updates 2014-10-31 21:55:25 -04:00
Fox-McCloud 4ad31c37c9 Merge pull request #26 from ZomgPonies/master 
Merge from Master
 2014-10-31 21:28:19 -04:00
Fox-McCloud 81c4b7b9e0 Merge pull request #456 from Fox-McCloud/VampireModeFix 
Vampire mode fix
 2014-10-31 07:55:53 -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 e5ea95a7d4 Merge pull request #25 from ZomgPonies/master 
Merge From Master
 2014-10-31 07:11:06 -04:00
Fox-McCloud 7bb168f1a1 Merge pull request #455 from Fox-McCloud/SyndiBomb-Fox 
Syndi bomb fix
 2014-10-31 00:22:12 -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 8dd8bb5b05 Psych Office Shutters Fixed Once More 
No HoP shutters this time.
 2014-10-30 19:54:11 -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 b149c24445 Merge pull request #24 from ZomgPonies/master 
Merge from Master
 2014-10-30 00:26:36 -04:00
Bone White 7d245233cd Floor Plaque Updated 
Floor plaque outside bridge now reads "NCS" instead of "NSS"

Thanks to Tigercat for the spriting.
 2014-10-30 03:49:40 +00:00
Fox-McCloud 1fe792ebac Merge pull request #453 from Fox-McCloud/Syndicate-Bomb 
Syndicate bomb
 2014-10-29 04:27:29 -04:00
Fox-McCloud 393ba993e2 Syndicate Bomb Port 2014-10-29 04:21:31 -04:00
Fox-McCloud 9bee98d896 Merge pull request #23 from ZomgPonies/master 
Merge from Master
 2014-10-29 02:20:52 -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 a391b7aea3 Merge pull request #449 from Fox-McCloud/Traitor-Balance 
Traitor balance
 2014-10-28 01:48:36 -04:00
Fox-McCloud f77eb5c914 Traitor Gear and Balance 2014-10-28 01:35:03 -04:00
Fox-McCloud cb6bb906a9 Merge pull request #22 from ZomgPonies/master 
Merge from Master
 2014-10-27 23:16:41 -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
Fox-McCloud 5322d94be8 Merge pull request #448 from Bone-White/revert-446-revert-445-master 
Revert "Revert "Civilian round-start fix""
 2014-10-27 22:56:29 -04:00
Bone-White 447f383a8a Revert "Revert "Civilian round-start fix"" 2014-10-28 02:53:03 +00:00
Bone White 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
Fox-McCloud a406d2ef64 Merge pull request #446 from ZomgPonies/revert-445-master 
Revert "Civilian round-start fix"
 2014-10-27 21:36:41 -04:00
Fox-McCloud eb21c8e4b0 Revert "Civilian round-start fix" 2014-10-27 21:36:18 -04:00
Fox-McCloud ab88e06519 Merge pull request #445 from Bone-White/master 
Civilian round-start fix
 2014-10-27 11:57:22 -04:00
Bone White 6853a69b1f Bulletproofing 
Better bulletproofing of the civilian round-start fix
 2014-10-27 15:53:35 +00:00
Bone White 9b9c20b115 Civilian round-start fix 2014-10-27 15:47:05 +00: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 89f6279a86 Merge pull request #442 from Fox-McCloud/Implant-Fix 
Implant fix
 2014-10-25 22:50:52 -04:00
Fox-McCloud e0059bbf46 Implant Fix 2014-10-25 22:47:09 -04:00
Fox-McCloud cced38f3b4 Merge pull request #21 from ZomgPonies/master 
Merge from Master
 2014-10-25 22:11:06 -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