Commit Graph

7205 Commits

Author SHA1 Message Date
kevinz000
6dfd0ab32d Update playsound.dm 2019-01-03 08:10:24 -08:00
deathride58
4c904ee5e6 Merge pull request #7846 from Citadel-Station-13/sdql2
SDQL2 upgrades!
2019-01-03 08:00:15 -05:00
deathride58
9ee2d94ab2 Merge pull request #7831 from Citadel-Station-13/ball_stuff
[No this is not just for testmerge]Adds the required assets for the ball map
2019-01-03 08:00:03 -05:00
deathride58
2d01ac3604 Merge pull request #7868 from Citadel-Station-13/kevinz000-patch-4
fixes neurotoxin properly
2019-01-03 07:47:34 -05:00
deathride58
1cd455b3b5 Merge pull request #7869 from Citadel-Station-13/kevinz000-patch-5
fixes xenotackle properly take 2
2019-01-03 07:47:02 -05:00
deathride58
52ac9dd5c8 Merge pull request #7872 from Citadel-Station-13/kevinz000-patch-7
fixes a pretty bad balance issue with tesla coils
2019-01-03 07:46:39 -05:00
deathride58
c3262dfdf2 Merge pull request #7874 from Citadel-Station-13/kevinz000-patch-8
Ninja event now respects the "only fire once" thing.
2019-01-03 07:45:47 -05:00
deathride58
aa1cbb0841 Merge pull request #7875 from Citadel-Station-13/kevinz000-patch-9
Devil event now respects the "only fire once" thing. (webeditor pr yo)
2019-01-03 07:45:26 -05:00
Trilbyspaceclone
a2ba37d664 Update all_nodes.dm (#7864) 2019-01-03 04:44:00 -08:00
Trilbyspaceclone
c50ca750d8 [Ready] Makes the YouTools and Vendomat more useful (#7870)
* Fixing updater

* Update youtool.dm

* Update assist.dm
2019-01-03 04:39:14 -08:00
Trilbyspaceclone
21f111b5e0 [Ready] New mech weapon, Melon Seed Scatter shot! - Requested and helped made by Elllsiy (#7873)
* Fixing updater

* Adds the gunthingy

* makes the bullet

* Update mecha_designs.dm

* Update all_nodes.dm

* Fixes stam harm
2019-01-03 04:38:10 -08:00
Trilbyspaceclone
09df2edf25 Update uplink_items.dm (#7877) 2019-01-03 04:36:52 -08:00
deathride58
6c8e0a67ad Ports tgstation/tgstation#42035 - Notifies admins when Lone Op event chance is changed (#7876)
* makes the nuke disk notify admins when the loneop event weight chance increases/decreases

* oh and the logging too

* fucking spaces sneaking into my ctrl+c > ctrl+v
2019-01-03 04:35:45 -08:00
kevinz000
ba24207f86 Update devil.dm 2019-01-01 00:06:13 -08:00
kevinz000
c620beec65 Update ninja_event.dm 2019-01-01 00:05:53 -08:00
kevinz000
f140d56b43 Update coil.dm 2018-12-31 23:41:01 -08:00
Trilbyspaceclone
1f1c5b3710 [Ready] Adds in a scatter shot Bulldog drum! (#7863)
* Fixing updater

* adds the ammo

* Update uplink_items.dm

* Update shotgun.dm

* Update uplink_items.dm
2018-12-31 03:11:44 -08:00
Trilbyspaceclone
cbae32f82d [Ready] Cargo packets with RLD RCD and IRCD! (#7840)
* *oh no*

* I know I know

* Update packs.dm

* Last touches

* "Not that op"

* Update packs.dm

* makes the IRCD

* Update packs.dm
2018-12-31 03:07:20 -08:00
kevinz000
8bada7f961 Update human_defense.dm 2018-12-30 22:23:13 -08:00
kevinz000
5c3eb5b00e Update neurotoxin.dm 2018-12-30 22:22:45 -08:00
nik707
6fbf3e07fe Merge pull request #7845 from Trilbyspaceclone/patch-30
Makes Bio suits = to Rad suits.
2018-12-25 02:23:46 -06:00
nik707
0fff94b4f7 Merge pull request #7847 from Citadel-Station-13/kevinz000-patch-3-1
fix xenos 2
2018-12-25 02:22:11 -06:00
kevinz000
0d78a109f6 Update human_defense.dm 2018-12-24 01:52:24 -08:00
kevinz000
96b4171044 Update neurotoxin.dm 2018-12-24 01:52:08 -08:00
kevinz000
502fb7cec8 Update SDQL_2.dm 2018-12-23 20:44:50 -08:00
kevinz000
d7397d5019 Update SDQL_2.dm 2018-12-23 20:44:32 -08:00
kevinz000
81f5bfa861 Update SDQL_2.dm 2018-12-23 20:34:22 -08:00
kevinz000
b40e1cd731 Update SDQL_2_parser.dm 2018-12-23 20:18:37 -08:00
kevinz000
34c8613681 Update SDQL_2.dm 2018-12-23 18:20:03 -08:00
kevinz000
03b88acbdb Update SDQL_2.dm 2018-12-23 18:19:21 -08:00
kevinz000
8531ff8595 Update SDQL_2.dm 2018-12-23 16:43:27 -08:00
kevinz000
32b4a5e75a Update SDQL_2.dm 2018-12-23 16:37:19 -08:00
kevinz000
0106867cac Update SDQL_2.dm 2018-12-23 16:35:58 -08:00
kevinz000
59b4f87313 Update SDQL_2_parser.dm 2018-12-23 15:18:32 -08:00
kevinz000
a70691e8f0 Update SDQL_2_parser.dm 2018-12-23 13:04:38 -08:00
kevinz000
53abb3c3dd THAT WAS CLOSE 2018-12-23 12:42:41 -08:00
kevinz000
2de19690e2 SDQL2 upgrades! 2018-12-23 11:53:10 -08:00
Trilbyspaceclone
687bbb1397 makes them = 2018-12-22 11:36:20 -05:00
Trilbyspaceclone
451dd8948a Update bio.dm 2018-12-22 11:22:48 -05:00
BlackMajor
f50b839c25 Wizard objectives are shit and nobody follows them anyway. (#7835)
* Update wizard.dm

* Update wizard.dm

* Update wizard.dm
2018-12-20 01:04:51 -08:00
deathride58
bf818c2be5 Merge pull request #7827 from Tupinambis/AshWalkerV2
The improved Ash Walker Experience (Hisser Approved)
2018-12-20 03:34:23 -05:00
deathride58
1756a0e59f Merge pull request #7830 from Poojawa/patch-2
Re adds missed QOL with posibrain sounds
2018-12-20 03:25:25 -05:00
deathride58
fe92f9106b Merge pull request #7833 from Citadel-Station-13/exemption
JEXP Exemption now exempts from account age locks too
2018-12-20 03:15:11 -05:00
Trilbyspaceclone
a47426ef48 Makes pinapple pizza eatable (#7821)
>Not just removing it
2018-12-18 21:25:40 -08:00
Ignari-Coldstorm
aa57d42d6c Fixes duplicate medipen.
Fixes a duplicate medipen showing up in vendor list.
2018-12-17 20:28:04 -06:00
kevinz000
8812ef9ddd exemption 2018-12-16 11:05:26 -08:00
Ignari-Coldstorm
9c16527cd4 Mining Vendor and PPKA changes! (#7817)
* Mining Vendor and PPKA changes!

Adjusted the prices on a couple items as well as added in the pocket extinguisher to the vendor. Adjusted the Premium Proto-Kinetic Accelerator to have one less range.

* Update machine_vending.dm
2018-12-16 03:56:21 -08:00
kevinz000
cf3e7d42a6 shit we don't have 2018-12-16 03:45:15 -08:00
kevinz000
1034a6ad0e ball stuff 2018-12-16 03:41:37 -08:00
Poojawa
44acfd9858 Re adds missed QOL with posibrain sounds
christ
2018-12-16 01:25:37 -06:00