Commit Graph

3875 Commits

Author SHA1 Message Date
CekisSWG
15dc7636fb Merge branch 'master' into witches_of_dath
# Conflicts:
#	sku.0/sys.server/compiled/game/datatables/item/master_item/item_stats.tab
#	sku.0/sys.server/compiled/game/datatables/item/master_item/master_item.tab
2020-03-31 21:49:16 -07:00
IrishDarkshadow
a947320570 removes test entries for a white saber crystal 2020-03-31 19:53:55 -04:00
IrishDarkshadow
b35f2eea64 fixes multiple colour crystal bugs and allows for new custom sabers to be added easily if needed 2020-03-31 13:11:16 -04:00
IrishDarkshadow
b032834b96 fixes tyranus crystal colouring, qui gon crystal damage and power crystal colour to match new palette 2020-03-29 07:16:30 -04:00
IrishDarkshadow
cff2573142 adds files midstream into ACM builds that the base scripts ignore 2020-03-25 18:42:39 -04:00
IrishDarkshadow
01da605b4f Merge branch 'master' of https://github.com/SWG-Source/dsrc 2020-03-17 13:29:00 -04:00
IrishDarkshadow
679a733fa5 restores the female narglatch model to wild spawns 2020-03-17 13:28:16 -04:00
CekisSWG
9d09b89b5c Fixed issue with Restuss Criers if starting Restuss in stage 3. 2020-03-04 18:05:51 -05:00
CekisSWG
46061abe5b Fixed mis-located mission terminals for the Emperors Retreat 2020-02-27 14:02:32 -05:00
CekisSWG
48c938ac6f Fixed issues with Restuss and Galactic Information Brokers 2020-02-27 11:04:47 -05:00
CekisSWG
34d6a94a5d Removed extra Restuss Galactic Information Broker spawners 2020-02-27 10:50:26 -05:00
CekisSWG
9b84a2cdb9 Merge branch 'master' of github.com:SWG-Source/dsrc 2020-02-07 01:18:37 -05:00
CekisSWG
fa49411b58 Fixed issue with IG-88 Head timer not being stored correctly and thereby removing re-use timer on logout. 2020-02-07 01:17:22 -05:00
CekisSWG
5a1a23dfab Fixed issue with IG-88 Head timer not being stored correctly and thereby removing re-use timer on logout. 2020-02-07 01:09:33 -05:00
CekisSWG
61dbb824a6 Merge branch 'master' of github.com:SWG-Source/dsrc 2020-02-06 01:41:30 -05:00
CekisSWG
597ab6f8d5 Changed reset message on usage of vet respec reward device 2020-02-06 01:41:15 -05:00
CekisSWG
3064a3367f Merge branch 'master' of github.com:SWG-Source/dsrc 2020-02-06 01:40:38 -05:00
CekisSWG
4850d44bc7 Merge branch 'master' of github.com:SWG-Source/dsrc 2020-02-06 00:49:45 -05:00
CekisSWG
e4c72231e9 Added scripting to support usage of the character respec reset device vet reward 2020-02-06 00:49:35 -05:00
CekisSWG
9ebe916c35 DNA Extractor will be removed from inventory on login if the player has completed the relevant quest 2020-02-06 00:48:24 -05:00
CekisSWG
310e703574 DNA Extractor will be removed from inventory on login if the player has completed the relevant quest 2020-02-05 01:43:23 -05:00
CekisSWG
71e368bb75 DNA Extractor will now be destroyed after completing Miner DNA Quest 2020-02-05 01:27:26 -05:00
Tekaoh
21d80133b1 Remove redundant objvar 2020-01-11 15:59:48 -06:00
Reedux
795c1fe00d Change ITV check to a datatable query for ease of adding future ITVs (#78)
* Change ITV check to a datatable query for ease of adding future ITV vehicles

* Adjusted to check if ITV has already been learned

Idea from tyrones PR https://github.com/SWG-Source/dsrc/pull/77

Co-authored-by: rotations <jblum@mills.edu>
2020-01-11 15:53:26 -06:00
Cekis
536c5bf2d1 Merge pull request #77 from TyroneSWG/master
ITV deeds may no longer be used more than once.
2020-01-11 12:06:52 -08:00
Freddy
ee5e7f5f7b Merge pull request #2 from TyroneSWG/revert-1-atmo
Revert "In Work"
2020-01-10 23:15:04 -06:00
Freddy
2d661a23f7 Revert "In Work" 2020-01-10 23:14:47 -06:00
Freddy
c33f035712 Merge pull request #1 from SWG-Source/atmo
In Work
2020-01-10 23:07:57 -06:00
TyroneSWG
4b1364303d Cleanup pt.2 2020-01-10 22:59:34 -06:00
TyroneSWG
0683862226 Cleanup 2020-01-10 22:57:58 -06:00
CekisSWG
8a982726fb In Work 2020-01-10 18:49:45 -05:00
TyroneSWG
3be779386b Arena Terminal 2020-01-09 19:46:03 -06:00
TyroneSWG
e947d0489d Merge branch 'master' of https://github.com/TyroneSWG/dsrc 2020-01-01 23:07:25 -06:00
TyroneSWG
b3666cf839 ITV cont. 2020-01-01 23:07:01 -06:00
TyroneSWG
db074b0a87 ITV deeds may no longer be used more than once. 2020-01-01 23:33:36 -05:00
IrishDarkshadow
541ea74ce5 adds the theatrical and IMAX posters for The Rise Of Skywalker 2019-12-24 16:51:46 -05:00
IrishDarkshadow
4ffb4711ec adds static item-name entries for DWB Mandalorian armour pieces 2019-12-23 20:44:28 -05:00
IrishDarkshadow
3fcfcfc106 Merge branch 'master' of https://github.com/SWG-Source/dsrc 2019-12-23 19:26:52 -05:00
IrishDarkshadow
9b5cd88c07 allows Master Officer to wear Mandalorian armour 2019-12-23 19:25:53 -05:00
CekisSWG
4443afc9dc Added Overhead air Traffic to Major Starports
commit b0dc6c97e04780ec8b2448fb7ead1ffa77899fa4
Merge: a90ca60cd 7d60e3304
Author: CekisSWG <cekisswg@gmail.com>
Date:   Tue Nov 26 16:06:08 2019 -0800

    Merge branch 'master' into traffic

commit a90ca60cd6499b3d17707c13bd1aed5a4e46c2f3
Author: Cekis <cekisswg@gmail.com>
Date:   Mon Nov 11 17:59:56 2019 -0500

    Added overhead traffic to large starports on Naboo, Corellia and Tatooine
2019-11-26 16:06:58 -08:00
CekisSWG
7d60e3304f Merged in Server Load Manager
commit 4e0d5be5dd8f160656900a248f3b75271c5fffbd
Merge: a3c094920 42aaad110
Author: CekisSWG <cekisswg@gmail.com>
Date:   Tue Nov 26 16:04:16 2019 -0800

    Merge branch 'master' into server_load_manager

commit a3c0949207e0ebfc106b77259860f2410a6cb361
Author: Cekis <cekisswg@gmail.com>
Date:   Wed Oct 9 17:02:39 2019 -0400

    Fixed Mos Eisley Harassment

commit 6198d99d32997a2ffd27e43b1356d6b44faaf0fc
Author: Cekis <cekisswg@gmail.com>
Date:   Sat Sep 28 19:45:41 2019 -0400

    Created Server Load Manager
2019-11-26 16:05:18 -08:00
CekisSWG
42aaad1104 Added potential memory saver. 2019-11-18 15:51:13 -05:00
Cekis
d57564a717 Missed one! 2019-11-04 20:56:24 -08:00
Cekis
1eeac441fd Backpacks can now be sold - thanks Elour and Legends! 2019-11-04 20:52:55 -08:00
Cekis
9677f060de Merge pull request #61 from ResurgenceDark/patch-8
Fixed Bug with GCW Banner.
2019-10-22 13:18:41 -07:00
Dark
d76021eefb Fixed Syntax
Added Missing Closing Quotations to Line 54.
2019-10-22 10:05:38 -05:00
IrishDarkshadow
64618c3a3c removes prof wheel link for structures trader to incomplete Naboo med s2 player house 2019-10-19 13:47:23 -04:00
Dark
92a6d9d8db Fixed Bug with GCW Banner.
Fixed Bug where Entertainer and Trader Buffs wouldn't activate from the GCW "Captain" Banner.
2019-10-18 18:39:27 -05:00
IrishDarkshadow
e8dc71b240 Merge branch 'master' of https://github.com/SWG-Source/dsrc 2019-10-11 19:20:36 -04:00
IrishDarkshadow
7ae7b51385 adds missing GOT to corrrect right bicep sorting in the crafting tool 2019-10-11 19:19:30 -04:00