cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-26 01:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,182 Commits 55 Branches 0 Tags
cd5317d1375d6e4efc901b807b9f52f52460699b
Commit Graph

7677 Commits

Author SHA1 Message Date
nik707
8996066c75 Merge pull request #7886 from Citadel-Station-13/kevinz000-patch-2 
adds pitch settings to playsound
 2019-01-06 14:27:27 -06:00
nik707
e3732519d9 Merge pull request #7887 from Citadel-Station-13/kevinz000-patch-4-1 
Fixes cooking oil oversight
 2019-01-06 14:27:10 -06:00
Trilbyspaceclone
3ae46ba2da Moves RCLD to a proper place 2019-01-06 04:27:06 -05:00
Ragolution
6e30048029 I guess it didn't like that. 
I don't know how to fix this so I'm changing it back uwu
 2019-01-04 08:20:27 -05:00
Ragolution
e390f37998 Adjusts wording for grammar on cryo shotgun dart 
Travis is fucking bullying me.
 2019-01-04 07:36:32 -05:00
Ragolution
5f019696bd Spellcheck 2 Electric Boogaloo 
statis

Misspelling of status.
 2019-01-04 06:52:57 -05:00
kevinz000
277b589f1f Update weapon_designs.dm 2019-01-04 03:44:47 -08:00
kevinz000
2340aebe71 Update drug_reagents.dm 2019-01-04 00:47:26 -08:00
kevinz000
246d6b391f Update medicine_reagents.dm 2019-01-04 00:47:02 -08:00
kevinz000
302f8f00f4 Update tomato.dm 2019-01-04 00:42:29 -08:00
Ragolution
6aed6d5612 Fixes all vg/5th port uniforms that aren't commented out for whatever reason. 
I'm pissy that this was so easy and nobody else bothered to do it.
 2019-01-04 01:55:33 -05:00
kevinz000
5abdf53e35 Update medicine_reagents.dm 2019-01-03 16:31:24 -08:00
kevinz000
a032b8d5f8 Update drug_reagents.dm 2019-01-03 16:17:35 -08:00
kevinz000
dc5f4ea67b Update medicine_reagents.dm 2019-01-03 16:15:34 -08:00
kevinz000
2444fac7b5 Update medicine_reagents.dm 2019-01-03 16:14:24 -08:00
kevinz000
b365db114f Update food_reagents.dm 2019-01-03 08:32:12 -08:00
kevinz000
71cf822138 Update snacks_bread.dm 2019-01-03 08:19:06 -08:00
kevinz000
6dfd0ab32d Update playsound.dm 2019-01-03 08:10:24 -08:00
kevinz000
a1836c98af Update snacks_bread.dm 2019-01-03 07:37:04 -08:00
kevinz000
bacb74ad47 Update snacks_bread.dm 2019-01-03 07:34:09 -08:00
kevinz000
e9ce54e397 Update snacks_bread.dm 2019-01-03 07:32:39 -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
906922a3e3 Update all_nodes.dm 2019-01-03 04:30:24 -08:00
kevinz000
b041f3318c Update electronics_designs.dm 2019-01-03 04:29:36 -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